diff --git a/src/checkoutservice/Gopkg.lock b/src/checkoutservice/Gopkg.lock index a28bb0b..0a14a45 100644 --- a/src/checkoutservice/Gopkg.lock +++ b/src/checkoutservice/Gopkg.lock @@ -14,12 +14,22 @@ version = "v0.27.0" [[projects]] - digest = "1:88c6ac35040514b109563791e3fb12f6968b113fea1e157f7d0832d7ec0731fc" + digest = "1:b9e278568a0e5bb8131bc5dce1d67c5dc115a47d819a2eb00c852a46ea650470" name = "contrib.go.opencensus.io/exporter/ocagent" packages = ["."] pruneopts = "UT" - revision = "0f05d9670984afdc81868312ebc4f259e7797b14" - version = "v0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" + +[[projects]] + digest = "1:9356748988f5bcc6ef8a99393e16e5963be39de6275b695df05cc09125202210" + name = "contrib.go.opencensus.io/resource" + packages = [ + "gcp", + "gke", + ] + pruneopts = "UT" + revision = "89b0f641c1ae3be4f9b22462fa8db7b93e44becb" + version = "v0.1.1" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" @@ -30,15 +40,15 @@ version = "v0.3.1" [[projects]] - digest = "1:f6bdf3d8d3cbb2f98d3ebaa66b3ac25166a06830027ece7d592d9ea09dedf504" + digest = "1:4287343c81d259e828b2e3b579270139a498a2168fbab81d89c3b9926b4ec740" name = "github.com/GoogleCloudPlatform/microservices-demo" packages = [ "src/checkoutservice/genproto", "src/checkoutservice/money", ] pruneopts = "UT" - revision = "bae651f7ea537d2676b38a04d89adacdd45c17bd" - version = "v0.1.0" + revision = "27df445fc20f048c1c31e429f6c29075119fe454" + version = "v0.1.1" [[projects]] digest = "1:fdb4ed936abeecb46a8c27dcac83f75c05c87a46d9ec7711411eb785c213fa02" @@ -56,7 +66,7 @@ version = "v0.2.0" [[projects]] - digest = "1:ed36cad843ad3fc4a300c7986d00a3732b4f8f53307f2a7b5945d0c108a19ad1" + digest = "1:cae83f1bd7175bdeff2a9ed2c45df421b0d839268e224bffec016d7f0d8c9159" name = "github.com/golang/protobuf" packages = [ "jsonpb", @@ -75,8 +85,7 @@ "ptypes/wrappers", ] pruneopts = "UT" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" [[projects]] branch = "master" @@ -84,7 +93,7 @@ name = "github.com/google/pprof" packages = ["profile"] pruneopts = "UT" - revision = "f8f10df8421355d11843c3719debc9dec2cc1ad7" + revision = "54271f7e092ff31b10b7626fee166cbc6304e350" [[projects]] digest = "1:582b704bebaa06b48c29b0cec224a6058a09c86883aaddabde889cd1a5f73e1b" @@ -95,18 +104,18 @@ version = "v1.1.1" [[projects]] - digest = "1:261b87bf0e61d028a24685e81b0f2c08042c5ca4bf5c31e910c0e59a2dd96192" + digest = "1:4f880e8e7ff8803aab4bcf2c479eb766435f7decaa1edf080d8f2bf56668de1d" name = "github.com/googleapis/gax-go" packages = [ ".", "v2", ] pruneopts = "UT" - revision = "beaecbbdd8af86aa3acf14180d53828ce69400b2" - version = "v2.0.4" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:4cbbca3db0ff89197d000fb2fa0b90ca4516a7fbd4d8cd9fa4bebf17df484f6d" + digest = "1:c20c9a82345346a19916a0086e61ea97425172036a32b8a8975490da6a129fda" name = "github.com/grpc-ecosystem/grpc-gateway" packages = [ "internal", @@ -114,8 +123,8 @@ "utilities", ] pruneopts = "UT" - revision = "20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - version = "v1.8.5" + revision = "cd0c8ef3533e9c04e6520cac37a81fe262fb0b34" + version = "v1.9.2" [[projects]] digest = "1:67474f760e9ac3799f740db2c489e6423a4cde45520673ec123ac831ad849cb8" @@ -134,15 +143,15 @@ version = "v1.0.2" [[projects]] - digest = "1:fd61cf4ae1953d55df708acb6b91492d538f49c305b364a014049914495db426" + digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "UT" - revision = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f" - version = "v1.4.1" + revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" + version = "v1.4.2" [[projects]] - digest = "1:6520a1be571a7391c852b2c3aea71830651d53e2df71f2997671fe6eb4d253a3" + digest = "1:c47e725105018001efa01ea70849a9dd42f2ebdf1ad33391dd2d12c257e8ceaa" name = "go.opencensus.io" packages = [ ".", @@ -152,6 +161,7 @@ "metric/metricproducer", "plugin/ocgrpc", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -162,8 +172,8 @@ "trace/tracestate", ] pruneopts = "UT" - revision = "46618d076d80f4eab85adbcb3be9a370be1dc4e0" - version = "v0.20.0" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] branch = "master" @@ -174,22 +184,22 @@ "cmd/apidiff", ] pruneopts = "UT" - revision = "7fd597ecf5563971626ffbf559e12e323c9f5602" + revision = "efd6b22b2522a48712e1fd0b3c1ab34d243f5245" [[projects]] branch = "master" - digest = "1:340d6f630598ebfa4e9ee059a137fe928e493e837efd7cbb663dc32fef1d2b0a" + digest = "1:134674d729e1afbae39eeaa6abcf8e5f3106338f83643394ab5205a020efbd9b" name = "golang.org/x/lint" packages = [ ".", "golint", ] pruneopts = "UT" - revision = "d0100b6bd8b389f0385611eb39152c4d7c3a7905" + revision = "959b441ac422379a43da2230f62be024250818b0" [[projects]] branch = "master" - digest = "1:e87f576319e558a57920a69ccdeb7d597f18d5541633c529224c35aa2185e5f4" + digest = "1:2f357867bf425774d35beca5be718402a4488b8b23b1563ce8c5bb91d09285a7" name = "golang.org/x/net" packages = [ "context", @@ -202,11 +212,11 @@ "trace", ] pruneopts = "UT" - revision = "b630fd6fe46bcfc98f989005d8b8ec1400e60a6e" + revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938" [[projects]] branch = "master" - digest = "1:645cb780e4f3177111b40588f0a7f5950efcfb473e7ff41d8d81b2ba5eaa6ed5" + digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b" name = "golang.org/x/oauth2" packages = [ ".", @@ -216,32 +226,34 @@ "jwt", ] pruneopts = "UT" - revision = "9f3314589c9a9136388751d9adae6b0ed400978a" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" [[projects]] branch = "master" - digest = "1:75515eedc0dc2cb0b40372008b616fa2841d831c63eedd403285ff286c593295" + digest = "1:382bb5a7fb4034db3b6a2d19e5a4a6bcf52f4750530603c01ca18a172fa3089b" name = "golang.org/x/sync" packages = ["semaphore"] pruneopts = "UT" - revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:e18c1645adfe83d66f80d3676040e478895669f9456ca8bafa6a7290656c1b48" + digest = "1:a2b03582f5805ebb5d96482a0ea550d48aba5347cc5089d89d2307ac55b98660" name = "golang.org/x/sys" packages = ["unix"] pruneopts = "UT" - revision = "81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2" + revision = "d432491b91382bba9c2a91776aa47c9430183a6f" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -254,12 +266,12 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:11a19bc8bcf4f5bcc5e2aa79a2bdbf5a39d8d812d24f6274390ef781450dc751" + digest = "1:959a78e48dea708230fa7a380ccc3e8019c3aa3537f93019dd3c47b50d0baf48" name = "golang.org/x/tools" packages = [ "cmd/goimports", @@ -272,17 +284,17 @@ "go/loader", "go/packages", "go/types/typeutil", - "imports", "internal/fastwalk", "internal/gopathwalk", + "internal/imports", "internal/module", "internal/semver", ] pruneopts = "UT" - revision = "923d25813098b2ffdf1b4bb7ee4ec425fef796a9" + revision = "6e04913cbbac05c5c0c9d8f237717e292f700e76" [[projects]] - digest = "1:f3a2e0ed1b493e955d895f5caf4b411e5e0163f0aa166966baff3cb514999c69" + digest = "1:ff7d4e127c373418b25aeff20b8bb7f736ab0a560199f07deb7ba156e6d0451b" name = "google.golang.org/api" packages = [ "internal", @@ -291,11 +303,11 @@ "transport/grpc", ] pruneopts = "UT" - revision = "bce707a4d0ea3488942724b3bcc1c8338f38f991" - version = "v0.3.0" + revision = "aac82e61c0c8fe133c297b4b59316b9f481e1f0a" + version = "v0.6.0" [[projects]] - digest = "1:15b86ee56687b2b842431678dacd1050900cd5ea24a47fa908ac32ce540664b7" + digest = "1:2c26b1c47556c0e5e73cdb05d8361c463737eee4baac35d38b40c728c3074a94" name = "google.golang.org/appengine" packages = [ ".", @@ -312,12 +324,12 @@ "urlfetch", ] pruneopts = "UT" - revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" - version = "v1.5.0" + revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" + version = "v1.6.1" [[projects]] branch = "master" - digest = "1:78cced93a35e7b8ec378a7c3fccacc0161a26636938f1130225269ebef1a7c2e" + digest = "1:9ba517da3141030aa8476305f6b013b0bf91209ab5905975d540c02dd1d76b97" name = "google.golang.org/genproto" packages = [ "googleapis/api/annotations", @@ -328,19 +340,31 @@ "protobuf/field_mask", ] pruneopts = "UT" - revision = "f467c93bbac2133ff463e1f93d18d8f9f3f04451" + revision = "6af8c5fc6601ab6b41cd32742a65ce2f5bd9db57" [[projects]] - digest = "1:6497ab07ec89179db8d5a563d33635be04ceffaa29007a3ae74b9f15f4d3068e" + digest = "1:f228b41f80d49e486280e0805195f564ecd1227911b882318a5adc29353f492d" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", + "balancer/grpclb", + "balancer/grpclb/grpc_lb_v1", "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/alts", + "credentials/alts/internal", + "credentials/alts/internal/authinfo", + "credentials/alts/internal/conn", + "credentials/alts/internal/handshaker", + "credentials/alts/internal/handshaker/service", + "credentials/alts/internal/proto/grpc_gcp", + "credentials/google", + "credentials/internal", "credentials/oauth", "encoding", "encoding/proto", @@ -348,9 +372,13 @@ "health/grpc_health_v1", "internal", "internal/backoff", + "internal/balancerload", + "internal/binarylog", "internal/channelz", "internal/envconfig", "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", "internal/transport", "keepalive", "metadata", @@ -364,8 +392,8 @@ "tap", ] pruneopts = "UT" - revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455" - version = "v1.14.0" + revision = "501c41df7f472c740d0674ff27122f3f48c80ce7" + version = "v1.21.1" [[projects]] digest = "1:e7f29d557575410f09b303a6270a20f17b2dcb69d3bbc4d71d89f5d8e927416d" @@ -403,6 +431,7 @@ input-imports = [ "cloud.google.com/go/profiler", "contrib.go.opencensus.io/exporter/ocagent", + "contrib.go.opencensus.io/resource/gke", "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/genproto", "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/money", "github.com/golang/protobuf/proto", diff --git a/src/checkoutservice/Gopkg.toml b/src/checkoutservice/Gopkg.toml index 8711780..eb20734 100644 --- a/src/checkoutservice/Gopkg.toml +++ b/src/checkoutservice/Gopkg.toml @@ -31,11 +31,13 @@ [[constraint]] name = "contrib.go.opencensus.io/exporter/ocagent" - version = "0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" +# version = "0.4.12" [[constraint]] name = "github.com/golang/protobuf" - version = "1.2.0" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" +# version = "1.2.0" [[constraint]] name = "github.com/google/uuid" @@ -47,7 +49,7 @@ [[constraint]] name = "go.opencensus.io" - version = "0.20.0" + version = "0.22.0" [[constraint]] branch = "master" @@ -55,7 +57,7 @@ [[constraint]] name = "google.golang.org/grpc" - version = "=1.14.0" + version = "1.15.0" [prune] go-tests = true diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 57678a1..fdfd8bf 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -23,6 +23,7 @@ import ( "cloud.google.com/go/profiler" "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opencensus.io/resource/gke" "github.com/google/uuid" "github.com/sirupsen/logrus" @@ -108,6 +109,7 @@ func registerOcAgentExporter() { ocaAddr := fmt.Sprintf("%s:%s", ocaHost, "55678") oce, err := ocagent.NewExporter(ocagent.WithInsecure(), + ocagent.WithResourceDetector(gke.Detect), ocagent.WithAddress(ocaAddr)) if err != nil { log.Warnf("Failed to create ocagent-exporter: %v", err) @@ -167,6 +169,11 @@ func mustMapEnv(target *string, envKey string) { *target = v } +// Watch is unimplemented interface for health checking. +func (s *checkoutService) Watch(in *healthpb.HealthCheckRequest, stream healthpb.Health_WatchServer) error { + return status.Error(codes.Unimplemented, codes.Unimplemented.String()) +} + func (cs *checkoutService) Check(ctx context.Context, req *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) { return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVING}, nil } diff --git a/src/frontend/Gopkg.lock b/src/frontend/Gopkg.lock index 0dfaedb..1a448f4 100644 --- a/src/frontend/Gopkg.lock +++ b/src/frontend/Gopkg.lock @@ -14,12 +14,22 @@ version = "v0.27.0" [[projects]] - digest = "1:88c6ac35040514b109563791e3fb12f6968b113fea1e157f7d0832d7ec0731fc" + digest = "1:b9e278568a0e5bb8131bc5dce1d67c5dc115a47d819a2eb00c852a46ea650470" name = "contrib.go.opencensus.io/exporter/ocagent" packages = ["."] pruneopts = "UT" - revision = "0f05d9670984afdc81868312ebc4f259e7797b14" - version = "v0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" + +[[projects]] + digest = "1:9356748988f5bcc6ef8a99393e16e5963be39de6275b695df05cc09125202210" + name = "contrib.go.opencensus.io/resource" + packages = [ + "gcp", + "gke", + ] + pruneopts = "UT" + revision = "89b0f641c1ae3be4f9b22462fa8db7b93e44becb" + version = "v0.1.1" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" @@ -30,15 +40,15 @@ version = "v0.3.1" [[projects]] - digest = "1:6cbe7676244a1429f4c22601f799d377a70449469ef636f91d992d719b559ff3" + digest = "1:c4f0a05580fb5d27e1cc8f5723a8d33fd97590a931e845f23b104e05c02ea80b" name = "github.com/GoogleCloudPlatform/microservices-demo" packages = [ "src/frontend/genproto", "src/frontend/money", ] pruneopts = "UT" - revision = "bae651f7ea537d2676b38a04d89adacdd45c17bd" - version = "v0.1.0" + revision = "27df445fc20f048c1c31e429f6c29075119fe454" + version = "v0.1.1" [[projects]] digest = "1:fdb4ed936abeecb46a8c27dcac83f75c05c87a46d9ec7711411eb785c213fa02" @@ -56,7 +66,7 @@ version = "v0.2.0" [[projects]] - digest = "1:ed36cad843ad3fc4a300c7986d00a3732b4f8f53307f2a7b5945d0c108a19ad1" + digest = "1:cae83f1bd7175bdeff2a9ed2c45df421b0d839268e224bffec016d7f0d8c9159" name = "github.com/golang/protobuf" packages = [ "jsonpb", @@ -75,8 +85,7 @@ "ptypes/wrappers", ] pruneopts = "UT" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" [[projects]] branch = "master" @@ -84,7 +93,7 @@ name = "github.com/google/pprof" packages = ["profile"] pruneopts = "UT" - revision = "f8f10df8421355d11843c3719debc9dec2cc1ad7" + revision = "54271f7e092ff31b10b7626fee166cbc6304e350" [[projects]] digest = "1:582b704bebaa06b48c29b0cec224a6058a09c86883aaddabde889cd1a5f73e1b" @@ -95,26 +104,26 @@ version = "v1.1.1" [[projects]] - digest = "1:261b87bf0e61d028a24685e81b0f2c08042c5ca4bf5c31e910c0e59a2dd96192" + digest = "1:4f880e8e7ff8803aab4bcf2c479eb766435f7decaa1edf080d8f2bf56668de1d" name = "github.com/googleapis/gax-go" packages = [ ".", "v2", ] pruneopts = "UT" - revision = "beaecbbdd8af86aa3acf14180d53828ce69400b2" - version = "v2.0.4" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:ca59b1175189b3f0e9f1793d2c350114be36eaabbe5b9f554b35edee1de50aea" + digest = "1:3af6be4fee7c08f81f13d36f04ffb63ad4b6b5aaba12cce96095c7c2863d4912" name = "github.com/gorilla/mux" packages = ["."] pruneopts = "UT" - revision = "a7962380ca08b5a188038c69871b8d3fbdf31e89" - version = "v1.7.0" + revision = "ed099d42384823742bba0bf9a72b53b55c9e2e38" + version = "v1.7.2" [[projects]] - digest = "1:4cbbca3db0ff89197d000fb2fa0b90ca4516a7fbd4d8cd9fa4bebf17df484f6d" + digest = "1:c20c9a82345346a19916a0086e61ea97425172036a32b8a8975490da6a129fda" name = "github.com/grpc-ecosystem/grpc-gateway" packages = [ "internal", @@ -122,8 +131,8 @@ "utilities", ] pruneopts = "UT" - revision = "20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - version = "v1.8.5" + revision = "cd0c8ef3533e9c04e6520cac37a81fe262fb0b34" + version = "v1.9.2" [[projects]] digest = "1:67474f760e9ac3799f740db2c489e6423a4cde45520673ec123ac831ad849cb8" @@ -150,15 +159,15 @@ version = "v0.8.1" [[projects]] - digest = "1:fd61cf4ae1953d55df708acb6b91492d538f49c305b364a014049914495db426" + digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "UT" - revision = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f" - version = "v1.4.1" + revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" + version = "v1.4.2" [[projects]] - digest = "1:d1ff17c57578bd01afead8838fcb1d5a1e47ad35c610e047ae549a23bb977037" + digest = "1:19dbb405dcaeabd688d4b23cd7669edf70a02fe5b87da88b9f5b6f5b276d45b6" name = "go.opencensus.io" packages = [ ".", @@ -170,6 +179,7 @@ "plugin/ochttp", "plugin/ochttp/propagation/b3", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -180,8 +190,8 @@ "trace/tracestate", ] pruneopts = "UT" - revision = "46618d076d80f4eab85adbcb3be9a370be1dc4e0" - version = "v0.20.0" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] branch = "master" @@ -192,22 +202,22 @@ "cmd/apidiff", ] pruneopts = "UT" - revision = "7fd597ecf5563971626ffbf559e12e323c9f5602" + revision = "efd6b22b2522a48712e1fd0b3c1ab34d243f5245" [[projects]] branch = "master" - digest = "1:340d6f630598ebfa4e9ee059a137fe928e493e837efd7cbb663dc32fef1d2b0a" + digest = "1:134674d729e1afbae39eeaa6abcf8e5f3106338f83643394ab5205a020efbd9b" name = "golang.org/x/lint" packages = [ ".", "golint", ] pruneopts = "UT" - revision = "d0100b6bd8b389f0385611eb39152c4d7c3a7905" + revision = "959b441ac422379a43da2230f62be024250818b0" [[projects]] branch = "master" - digest = "1:e87f576319e558a57920a69ccdeb7d597f18d5541633c529224c35aa2185e5f4" + digest = "1:2f357867bf425774d35beca5be718402a4488b8b23b1563ce8c5bb91d09285a7" name = "golang.org/x/net" packages = [ "context", @@ -220,11 +230,11 @@ "trace", ] pruneopts = "UT" - revision = "b630fd6fe46bcfc98f989005d8b8ec1400e60a6e" + revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938" [[projects]] branch = "master" - digest = "1:645cb780e4f3177111b40588f0a7f5950efcfb473e7ff41d8d81b2ba5eaa6ed5" + digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b" name = "golang.org/x/oauth2" packages = [ ".", @@ -234,32 +244,34 @@ "jwt", ] pruneopts = "UT" - revision = "9f3314589c9a9136388751d9adae6b0ed400978a" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" [[projects]] branch = "master" - digest = "1:75515eedc0dc2cb0b40372008b616fa2841d831c63eedd403285ff286c593295" + digest = "1:382bb5a7fb4034db3b6a2d19e5a4a6bcf52f4750530603c01ca18a172fa3089b" name = "golang.org/x/sync" packages = ["semaphore"] pruneopts = "UT" - revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:e18c1645adfe83d66f80d3676040e478895669f9456ca8bafa6a7290656c1b48" + digest = "1:a2b03582f5805ebb5d96482a0ea550d48aba5347cc5089d89d2307ac55b98660" name = "golang.org/x/sys" packages = ["unix"] pruneopts = "UT" - revision = "81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2" + revision = "d432491b91382bba9c2a91776aa47c9430183a6f" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -272,12 +284,12 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:11a19bc8bcf4f5bcc5e2aa79a2bdbf5a39d8d812d24f6274390ef781450dc751" + digest = "1:959a78e48dea708230fa7a380ccc3e8019c3aa3537f93019dd3c47b50d0baf48" name = "golang.org/x/tools" packages = [ "cmd/goimports", @@ -290,17 +302,17 @@ "go/loader", "go/packages", "go/types/typeutil", - "imports", "internal/fastwalk", "internal/gopathwalk", + "internal/imports", "internal/module", "internal/semver", ] pruneopts = "UT" - revision = "923d25813098b2ffdf1b4bb7ee4ec425fef796a9" + revision = "6e04913cbbac05c5c0c9d8f237717e292f700e76" [[projects]] - digest = "1:f3a2e0ed1b493e955d895f5caf4b411e5e0163f0aa166966baff3cb514999c69" + digest = "1:ff7d4e127c373418b25aeff20b8bb7f736ab0a560199f07deb7ba156e6d0451b" name = "google.golang.org/api" packages = [ "internal", @@ -309,11 +321,11 @@ "transport/grpc", ] pruneopts = "UT" - revision = "bce707a4d0ea3488942724b3bcc1c8338f38f991" - version = "v0.3.0" + revision = "aac82e61c0c8fe133c297b4b59316b9f481e1f0a" + version = "v0.6.0" [[projects]] - digest = "1:15b86ee56687b2b842431678dacd1050900cd5ea24a47fa908ac32ce540664b7" + digest = "1:2c26b1c47556c0e5e73cdb05d8361c463737eee4baac35d38b40c728c3074a94" name = "google.golang.org/appengine" packages = [ ".", @@ -330,12 +342,12 @@ "urlfetch", ] pruneopts = "UT" - revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" - version = "v1.5.0" + revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" + version = "v1.6.1" [[projects]] branch = "master" - digest = "1:78cced93a35e7b8ec378a7c3fccacc0161a26636938f1130225269ebef1a7c2e" + digest = "1:9ba517da3141030aa8476305f6b013b0bf91209ab5905975d540c02dd1d76b97" name = "google.golang.org/genproto" packages = [ "googleapis/api/annotations", @@ -346,20 +358,30 @@ "protobuf/field_mask", ] pruneopts = "UT" - revision = "f467c93bbac2133ff463e1f93d18d8f9f3f04451" + revision = "6af8c5fc6601ab6b41cd32742a65ce2f5bd9db57" [[projects]] - digest = "1:4abdd62fcb53e7fb898e708754e3ec03254a870b35e826649b974c6811041808" + digest = "1:9db2e6e9d0d0a6580f01a242d30e895efd65b57ed923f50ea37667a6c09665bd" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", + "balancer/grpclb", + "balancer/grpclb/grpc_lb_v1", "balancer/roundrobin", "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/alts", + "credentials/alts/internal", + "credentials/alts/internal/authinfo", + "credentials/alts/internal/conn", + "credentials/alts/internal/handshaker", + "credentials/alts/internal/handshaker/service", + "credentials/alts/internal/proto/grpc_gcp", + "credentials/google", "credentials/internal", "credentials/oauth", "encoding", @@ -367,6 +389,7 @@ "grpclog", "internal", "internal/backoff", + "internal/balancerload", "internal/binarylog", "internal/channelz", "internal/envconfig", @@ -386,8 +409,8 @@ "tap", ] pruneopts = "UT" - revision = "3507fb8e1a5ad030303c106fef3a47c9fdad16ad" - version = "v1.19.1" + revision = "501c41df7f472c740d0674ff27122f3f48c80ce7" + version = "v1.21.1" [[projects]] digest = "1:e7f29d557575410f09b303a6270a20f17b2dcb69d3bbc4d71d89f5d8e927416d" @@ -425,6 +448,7 @@ input-imports = [ "cloud.google.com/go/profiler", "contrib.go.opencensus.io/exporter/ocagent", + "contrib.go.opencensus.io/resource/gke", "github.com/GoogleCloudPlatform/microservices-demo/src/frontend/genproto", "github.com/GoogleCloudPlatform/microservices-demo/src/frontend/money", "github.com/golang/protobuf/proto", diff --git a/src/frontend/Gopkg.toml b/src/frontend/Gopkg.toml index 097ab9b..5d76508 100644 --- a/src/frontend/Gopkg.toml +++ b/src/frontend/Gopkg.toml @@ -31,11 +31,13 @@ [[constraint]] name = "contrib.go.opencensus.io/exporter/ocagent" - version = "0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" +# version = "0.4.12" [[constraint]] name = "github.com/golang/protobuf" - version = "1.2.0" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" +# version = "1.2.0" [[constraint]] name = "github.com/google/uuid" @@ -55,7 +57,7 @@ [[constraint]] name = "go.opencensus.io" - version = "0.20.0" + version = "0.22.0" [[constraint]] branch = "master" diff --git a/src/frontend/main.go b/src/frontend/main.go index 0ae53ce..5371f41 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -23,6 +23,8 @@ import ( "cloud.google.com/go/profiler" "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opencensus.io/resource/gke" + "github.com/gorilla/mux" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -151,6 +153,7 @@ func registerOcAgentExporter(log logrus.FieldLogger) { ocaAddr := fmt.Sprintf("%s:%s", ocaHost, "55678") oce, err := ocagent.NewExporter(ocagent.WithInsecure(), + ocagent.WithResourceDetector(gke.Detect), ocagent.WithAddress(ocaAddr)) if err != nil { log.Warnf("Failed to create ocagent-exporter: %v", err) diff --git a/src/productcatalogservice/Gopkg.lock b/src/productcatalogservice/Gopkg.lock index bdfd171..9c9199f 100644 --- a/src/productcatalogservice/Gopkg.lock +++ b/src/productcatalogservice/Gopkg.lock @@ -14,12 +14,22 @@ version = "v0.27.0" [[projects]] - digest = "1:88c6ac35040514b109563791e3fb12f6968b113fea1e157f7d0832d7ec0731fc" + digest = "1:b9e278568a0e5bb8131bc5dce1d67c5dc115a47d819a2eb00c852a46ea650470" name = "contrib.go.opencensus.io/exporter/ocagent" packages = ["."] pruneopts = "UT" - revision = "0f05d9670984afdc81868312ebc4f259e7797b14" - version = "v0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" + +[[projects]] + digest = "1:9356748988f5bcc6ef8a99393e16e5963be39de6275b695df05cc09125202210" + name = "contrib.go.opencensus.io/resource" + packages = [ + "gcp", + "gke", + ] + pruneopts = "UT" + revision = "89b0f641c1ae3be4f9b22462fa8db7b93e44becb" + version = "v0.1.1" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" @@ -30,12 +40,12 @@ version = "v0.3.1" [[projects]] - digest = "1:14e66208d324c0ecb49934b5ac311c50a94e3a458e92b0026ef9e26919ac8d9d" + digest = "1:9370265bab17bdc207051ccedc34535484a12622a329839e580059c79236c1e3" name = "github.com/GoogleCloudPlatform/microservices-demo" packages = ["src/productcatalogservice/genproto"] pruneopts = "UT" - revision = "bae651f7ea537d2676b38a04d89adacdd45c17bd" - version = "v0.1.0" + revision = "27df445fc20f048c1c31e429f6c29075119fe454" + version = "v0.1.1" [[projects]] digest = "1:fdb4ed936abeecb46a8c27dcac83f75c05c87a46d9ec7711411eb785c213fa02" @@ -53,7 +63,7 @@ version = "v0.2.0" [[projects]] - digest = "1:ed36cad843ad3fc4a300c7986d00a3732b4f8f53307f2a7b5945d0c108a19ad1" + digest = "1:cae83f1bd7175bdeff2a9ed2c45df421b0d839268e224bffec016d7f0d8c9159" name = "github.com/golang/protobuf" packages = [ "jsonpb", @@ -72,8 +82,7 @@ "ptypes/wrappers", ] pruneopts = "UT" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" [[projects]] digest = "1:2e3c336fc7fde5c984d2841455a658a6d626450b1754a854b3b32e7a8f49a07a" @@ -94,21 +103,21 @@ name = "github.com/google/pprof" packages = ["profile"] pruneopts = "UT" - revision = "f8f10df8421355d11843c3719debc9dec2cc1ad7" + revision = "54271f7e092ff31b10b7626fee166cbc6304e350" [[projects]] - digest = "1:261b87bf0e61d028a24685e81b0f2c08042c5ca4bf5c31e910c0e59a2dd96192" + digest = "1:4f880e8e7ff8803aab4bcf2c479eb766435f7decaa1edf080d8f2bf56668de1d" name = "github.com/googleapis/gax-go" packages = [ ".", "v2", ] pruneopts = "UT" - revision = "beaecbbdd8af86aa3acf14180d53828ce69400b2" - version = "v2.0.4" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:4cbbca3db0ff89197d000fb2fa0b90ca4516a7fbd4d8cd9fa4bebf17df484f6d" + digest = "1:c20c9a82345346a19916a0086e61ea97425172036a32b8a8975490da6a129fda" name = "github.com/grpc-ecosystem/grpc-gateway" packages = [ "internal", @@ -116,8 +125,8 @@ "utilities", ] pruneopts = "UT" - revision = "20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - version = "v1.8.5" + revision = "cd0c8ef3533e9c04e6520cac37a81fe262fb0b34" + version = "v1.9.2" [[projects]] digest = "1:67474f760e9ac3799f740db2c489e6423a4cde45520673ec123ac831ad849cb8" @@ -136,15 +145,15 @@ version = "v1.0.2" [[projects]] - digest = "1:fd61cf4ae1953d55df708acb6b91492d538f49c305b364a014049914495db426" + digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "UT" - revision = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f" - version = "v1.4.1" + revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" + version = "v1.4.2" [[projects]] - digest = "1:6520a1be571a7391c852b2c3aea71830651d53e2df71f2997671fe6eb4d253a3" + digest = "1:c47e725105018001efa01ea70849a9dd42f2ebdf1ad33391dd2d12c257e8ceaa" name = "go.opencensus.io" packages = [ ".", @@ -154,6 +163,7 @@ "metric/metricproducer", "plugin/ocgrpc", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -164,8 +174,8 @@ "trace/tracestate", ] pruneopts = "UT" - revision = "46618d076d80f4eab85adbcb3be9a370be1dc4e0" - version = "v0.20.0" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] branch = "master" @@ -176,22 +186,22 @@ "cmd/apidiff", ] pruneopts = "UT" - revision = "7fd597ecf5563971626ffbf559e12e323c9f5602" + revision = "efd6b22b2522a48712e1fd0b3c1ab34d243f5245" [[projects]] branch = "master" - digest = "1:340d6f630598ebfa4e9ee059a137fe928e493e837efd7cbb663dc32fef1d2b0a" + digest = "1:134674d729e1afbae39eeaa6abcf8e5f3106338f83643394ab5205a020efbd9b" name = "golang.org/x/lint" packages = [ ".", "golint", ] pruneopts = "UT" - revision = "d0100b6bd8b389f0385611eb39152c4d7c3a7905" + revision = "959b441ac422379a43da2230f62be024250818b0" [[projects]] branch = "master" - digest = "1:e87f576319e558a57920a69ccdeb7d597f18d5541633c529224c35aa2185e5f4" + digest = "1:2f357867bf425774d35beca5be718402a4488b8b23b1563ce8c5bb91d09285a7" name = "golang.org/x/net" packages = [ "context", @@ -204,11 +214,11 @@ "trace", ] pruneopts = "UT" - revision = "b630fd6fe46bcfc98f989005d8b8ec1400e60a6e" + revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938" [[projects]] branch = "master" - digest = "1:645cb780e4f3177111b40588f0a7f5950efcfb473e7ff41d8d81b2ba5eaa6ed5" + digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b" name = "golang.org/x/oauth2" packages = [ ".", @@ -218,32 +228,34 @@ "jwt", ] pruneopts = "UT" - revision = "9f3314589c9a9136388751d9adae6b0ed400978a" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" [[projects]] branch = "master" - digest = "1:75515eedc0dc2cb0b40372008b616fa2841d831c63eedd403285ff286c593295" + digest = "1:382bb5a7fb4034db3b6a2d19e5a4a6bcf52f4750530603c01ca18a172fa3089b" name = "golang.org/x/sync" packages = ["semaphore"] pruneopts = "UT" - revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:e18c1645adfe83d66f80d3676040e478895669f9456ca8bafa6a7290656c1b48" + digest = "1:a2b03582f5805ebb5d96482a0ea550d48aba5347cc5089d89d2307ac55b98660" name = "golang.org/x/sys" packages = ["unix"] pruneopts = "UT" - revision = "81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2" + revision = "d432491b91382bba9c2a91776aa47c9430183a6f" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -256,12 +268,12 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:11a19bc8bcf4f5bcc5e2aa79a2bdbf5a39d8d812d24f6274390ef781450dc751" + digest = "1:959a78e48dea708230fa7a380ccc3e8019c3aa3537f93019dd3c47b50d0baf48" name = "golang.org/x/tools" packages = [ "cmd/goimports", @@ -274,17 +286,17 @@ "go/loader", "go/packages", "go/types/typeutil", - "imports", "internal/fastwalk", "internal/gopathwalk", + "internal/imports", "internal/module", "internal/semver", ] pruneopts = "UT" - revision = "923d25813098b2ffdf1b4bb7ee4ec425fef796a9" + revision = "6e04913cbbac05c5c0c9d8f237717e292f700e76" [[projects]] - digest = "1:f3a2e0ed1b493e955d895f5caf4b411e5e0163f0aa166966baff3cb514999c69" + digest = "1:ff7d4e127c373418b25aeff20b8bb7f736ab0a560199f07deb7ba156e6d0451b" name = "google.golang.org/api" packages = [ "internal", @@ -293,11 +305,11 @@ "transport/grpc", ] pruneopts = "UT" - revision = "bce707a4d0ea3488942724b3bcc1c8338f38f991" - version = "v0.3.0" + revision = "aac82e61c0c8fe133c297b4b59316b9f481e1f0a" + version = "v0.6.0" [[projects]] - digest = "1:15b86ee56687b2b842431678dacd1050900cd5ea24a47fa908ac32ce540664b7" + digest = "1:2c26b1c47556c0e5e73cdb05d8361c463737eee4baac35d38b40c728c3074a94" name = "google.golang.org/appengine" packages = [ ".", @@ -314,12 +326,12 @@ "urlfetch", ] pruneopts = "UT" - revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" - version = "v1.5.0" + revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" + version = "v1.6.1" [[projects]] branch = "master" - digest = "1:78cced93a35e7b8ec378a7c3fccacc0161a26636938f1130225269ebef1a7c2e" + digest = "1:9ba517da3141030aa8476305f6b013b0bf91209ab5905975d540c02dd1d76b97" name = "google.golang.org/genproto" packages = [ "googleapis/api/annotations", @@ -330,19 +342,31 @@ "protobuf/field_mask", ] pruneopts = "UT" - revision = "f467c93bbac2133ff463e1f93d18d8f9f3f04451" + revision = "6af8c5fc6601ab6b41cd32742a65ce2f5bd9db57" [[projects]] - digest = "1:6497ab07ec89179db8d5a563d33635be04ceffaa29007a3ae74b9f15f4d3068e" + digest = "1:f228b41f80d49e486280e0805195f564ecd1227911b882318a5adc29353f492d" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", + "balancer/grpclb", + "balancer/grpclb/grpc_lb_v1", "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/alts", + "credentials/alts/internal", + "credentials/alts/internal/authinfo", + "credentials/alts/internal/conn", + "credentials/alts/internal/handshaker", + "credentials/alts/internal/handshaker/service", + "credentials/alts/internal/proto/grpc_gcp", + "credentials/google", + "credentials/internal", "credentials/oauth", "encoding", "encoding/proto", @@ -350,9 +374,13 @@ "health/grpc_health_v1", "internal", "internal/backoff", + "internal/balancerload", + "internal/binarylog", "internal/channelz", "internal/envconfig", "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", "internal/transport", "keepalive", "metadata", @@ -366,8 +394,8 @@ "tap", ] pruneopts = "UT" - revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455" - version = "v1.14.0" + revision = "501c41df7f472c740d0674ff27122f3f48c80ce7" + version = "v1.21.1" [[projects]] digest = "1:e7f29d557575410f09b303a6270a20f17b2dcb69d3bbc4d71d89f5d8e927416d" @@ -405,6 +433,7 @@ input-imports = [ "cloud.google.com/go/profiler", "contrib.go.opencensus.io/exporter/ocagent", + "contrib.go.opencensus.io/resource/gke", "github.com/GoogleCloudPlatform/microservices-demo/src/productcatalogservice/genproto", "github.com/golang/protobuf/jsonpb", "github.com/golang/protobuf/proto", diff --git a/src/productcatalogservice/Gopkg.toml b/src/productcatalogservice/Gopkg.toml index 17a9370..1d816d3 100644 --- a/src/productcatalogservice/Gopkg.toml +++ b/src/productcatalogservice/Gopkg.toml @@ -31,11 +31,13 @@ [[constraint]] name = "contrib.go.opencensus.io/exporter/ocagent" - version = "0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" +# version = "0.4.12" [[constraint]] name = "github.com/golang/protobuf" - version = "1.2.0" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" +# version = "1.2.0" [[constraint]] name = "github.com/google/go-cmp" @@ -47,7 +49,7 @@ [[constraint]] name = "go.opencensus.io" - version = "0.20.0" + version = "0.22.0" [[constraint]] branch = "master" @@ -55,7 +57,7 @@ [[constraint]] name = "google.golang.org/grpc" - version = "=1.14.0" + version = "1.15.0" [prune] go-tests = true diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index 2c2d526..567487d 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -33,6 +33,8 @@ import ( "cloud.google.com/go/profiler" "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opencensus.io/resource/gke" + "github.com/golang/protobuf/jsonpb" "github.com/sirupsen/logrus" "go.opencensus.io/plugin/ocgrpc" @@ -132,6 +134,7 @@ func registerOcAgentExporter() { ocaAddr := fmt.Sprintf("%s:%s", ocaHost, "55678") oce, err := ocagent.NewExporter(ocagent.WithInsecure(), + ocagent.WithResourceDetector(gke.Detect), ocagent.WithAddress(ocaAddr)) if err != nil { log.Warnf("Failed to create ocagent-exporter: %v", err) @@ -211,6 +214,11 @@ func parseCatalog() []*pb.Product { return cat.Products } +// Watch is unimplemented interface for health checking. +func (p *productCatalog) Watch(in *healthpb.HealthCheckRequest, stream healthpb.Health_WatchServer) error { + return status.Error(codes.Unimplemented, codes.Unimplemented.String()) +} + func (p *productCatalog) Check(ctx context.Context, req *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) { return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVING}, nil } diff --git a/src/shippingservice/Gopkg.lock b/src/shippingservice/Gopkg.lock index 06b9b88..6a94755 100644 --- a/src/shippingservice/Gopkg.lock +++ b/src/shippingservice/Gopkg.lock @@ -2,46 +2,34 @@ [[projects]] - digest = "1:3a7694d9161ef0a36de3a5d9f1fa4304feb5945402af886f6ca2d37d9dfab9c8" + digest = "1:3b4d6ea003edcb38b0a80d1909d6d8270e3717506609929fb3407c7063018b4b" name = "cloud.google.com/go" packages = [ "compute/metadata", - "container/apiv1", "internal/version", - "monitoring/apiv3", "profiler", - "trace/apiv2", ] pruneopts = "UT" revision = "c728a003b238b26cef9ab6753a5dc424b331c3ad" version = "v0.27.0" [[projects]] - digest = "1:88c6ac35040514b109563791e3fb12f6968b113fea1e157f7d0832d7ec0731fc" + digest = "1:b9e278568a0e5bb8131bc5dce1d67c5dc115a47d819a2eb00c852a46ea650470" name = "contrib.go.opencensus.io/exporter/ocagent" packages = ["."] pruneopts = "UT" - revision = "0f05d9670984afdc81868312ebc4f259e7797b14" - version = "v0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" [[projects]] - digest = "1:a3fe3553caa2d85d022e0d234618989080225dc511c76bcd4e54fcda2e0d6e76" - name = "contrib.go.opencensus.io/exporter/stackdriver" + digest = "1:9356748988f5bcc6ef8a99393e16e5963be39de6275b695df05cc09125202210" + name = "contrib.go.opencensus.io/resource" packages = [ - ".", - "monitoredresource", + "gcp", + "gke", ] pruneopts = "UT" - revision = "e393203a62e3c9286501f3195fe2f2ca1e35e115" - version = "v0.10.0" - -[[projects]] - branch = "master" - digest = "1:cef70b547ce62d12ea8e5dcb9905bccb57ea1bb253ee6809fd79a17c29ca3cd5" - name = "contrib.go.opencensus.io/resource" - packages = ["resourcekeys"] - pruneopts = "UT" - revision = "21591786a5e0c21806209b266cc6dfdfa85b3cdb" + revision = "89b0f641c1ae3be4f9b22462fa8db7b93e44becb" + version = "v0.1.1" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" @@ -52,58 +40,12 @@ version = "v0.3.1" [[projects]] - digest = "1:27490301253ac5063d502480ef3794b95222eea6cb997ae6e689a058b1cd5253" + digest = "1:f47f56c0975afe777b239cc03631011db2667a51e59b177bf318748724d4455b" name = "github.com/GoogleCloudPlatform/microservices-demo" packages = ["src/shippingservice/genproto"] pruneopts = "UT" - revision = "bae651f7ea537d2676b38a04d89adacdd45c17bd" - version = "v0.1.0" - -[[projects]] - digest = "1:b39cf81d5f440b9c0757a25058432d33af867e5201109bf53621356d9dab4b73" - name = "github.com/apache/thrift" - packages = ["lib/go/thrift"] - pruneopts = "UT" - revision = "384647d290e2e4a55a14b1b7ef1b7e66293a2c33" - version = "v0.12.0" - -[[projects]] - digest = "1:8e6c4ca3eb56b64cf1505ab6b67b10e2ec2b69d518fb30fc028c5383f0729263" - name = "github.com/aws/aws-sdk-go" - packages = [ - "aws", - "aws/awserr", - "aws/awsutil", - "aws/client", - "aws/client/metadata", - "aws/corehandlers", - "aws/credentials", - "aws/credentials/ec2rolecreds", - "aws/credentials/endpointcreds", - "aws/credentials/processcreds", - "aws/credentials/stscreds", - "aws/csm", - "aws/defaults", - "aws/ec2metadata", - "aws/endpoints", - "aws/request", - "aws/session", - "aws/signer/v4", - "internal/ini", - "internal/sdkio", - "internal/sdkrand", - "internal/sdkuri", - "internal/shareddefaults", - "private/protocol", - "private/protocol/query", - "private/protocol/query/queryutil", - "private/protocol/rest", - "private/protocol/xml/xmlutil", - "service/sts", - ] - pruneopts = "UT" - revision = "53e87fccca39c3e7d20e5172dbe66aa13ff55d12" - version = "v1.19.10" + revision = "27df445fc20f048c1c31e429f6c29075119fe454" + version = "v0.1.1" [[projects]] digest = "1:fdb4ed936abeecb46a8c27dcac83f75c05c87a46d9ec7711411eb785c213fa02" @@ -121,7 +63,7 @@ version = "v0.2.0" [[projects]] - digest = "1:4d57cfecf525530b26c012f5444aa6c892317bb8622c5c684b6becfa56bdb61f" + digest = "1:cae83f1bd7175bdeff2a9ed2c45df421b0d839268e224bffec016d7f0d8c9159" name = "github.com/golang/protobuf" packages = [ "jsonpb", @@ -135,14 +77,12 @@ "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/empty", "ptypes/struct", "ptypes/timestamp", "ptypes/wrappers", ] pruneopts = "UT" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" [[projects]] branch = "master" @@ -150,21 +90,21 @@ name = "github.com/google/pprof" packages = ["profile"] pruneopts = "UT" - revision = "f8f10df8421355d11843c3719debc9dec2cc1ad7" + revision = "54271f7e092ff31b10b7626fee166cbc6304e350" [[projects]] - digest = "1:261b87bf0e61d028a24685e81b0f2c08042c5ca4bf5c31e910c0e59a2dd96192" + digest = "1:4f880e8e7ff8803aab4bcf2c479eb766435f7decaa1edf080d8f2bf56668de1d" name = "github.com/googleapis/gax-go" packages = [ ".", "v2", ] pruneopts = "UT" - revision = "beaecbbdd8af86aa3acf14180d53828ce69400b2" - version = "v2.0.4" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:4cbbca3db0ff89197d000fb2fa0b90ca4516a7fbd4d8cd9fa4bebf17df484f6d" + digest = "1:c20c9a82345346a19916a0086e61ea97425172036a32b8a8975490da6a129fda" name = "github.com/grpc-ecosystem/grpc-gateway" packages = [ "internal", @@ -172,8 +112,8 @@ "utilities", ] pruneopts = "UT" - revision = "20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - version = "v1.8.5" + revision = "cd0c8ef3533e9c04e6520cac37a81fe262fb0b34" + version = "v1.9.2" [[projects]] digest = "1:67474f760e9ac3799f740db2c489e6423a4cde45520673ec123ac831ad849cb8" @@ -183,13 +123,6 @@ revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" version = "v0.5.1" -[[projects]] - digest = "1:bb81097a5b62634f3e9fec1014657855610c82d19b9a40c17612e32651e35dca" - name = "github.com/jmespath/go-jmespath" - packages = ["."] - pruneopts = "UT" - revision = "c2b33e84" - [[projects]] digest = "1:31e761d97c76151dde79e9d28964a812c46efc5baee4085b86f68f0c654450de" name = "github.com/konsorten/go-windows-terminal-sequences" @@ -199,29 +132,25 @@ version = "v1.0.2" [[projects]] - digest = "1:fd61cf4ae1953d55df708acb6b91492d538f49c305b364a014049914495db426" + digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "UT" - revision = "8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f" - version = "v1.4.1" + revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" + version = "v1.4.2" [[projects]] - digest = "1:2fe200be9ca91170176b0dffa825de8ae56465320fcaa3c83fc188cc72da614d" + digest = "1:c47e725105018001efa01ea70849a9dd42f2ebdf1ad33391dd2d12c257e8ceaa" name = "go.opencensus.io" packages = [ ".", - "exporter/jaeger", - "exporter/jaeger/internal/gen-go/jaeger", "internal", "internal/tagencoding", "metric/metricdata", - "metric/metricexport", "metric/metricproducer", "plugin/ocgrpc", - "plugin/ochttp", - "plugin/ochttp/propagation/b3", "resource", + "resource/resourcekeys", "stats", "stats/internal", "stats/view", @@ -232,8 +161,8 @@ "trace/tracestate", ] pruneopts = "UT" - revision = "46618d076d80f4eab85adbcb3be9a370be1dc4e0" - version = "v0.20.0" + revision = "9c377598961b706d1542bd2d84d538b5094d596e" + version = "v0.22.0" [[projects]] branch = "master" @@ -244,22 +173,22 @@ "cmd/apidiff", ] pruneopts = "UT" - revision = "7fd597ecf5563971626ffbf559e12e323c9f5602" + revision = "efd6b22b2522a48712e1fd0b3c1ab34d243f5245" [[projects]] branch = "master" - digest = "1:340d6f630598ebfa4e9ee059a137fe928e493e837efd7cbb663dc32fef1d2b0a" + digest = "1:134674d729e1afbae39eeaa6abcf8e5f3106338f83643394ab5205a020efbd9b" name = "golang.org/x/lint" packages = [ ".", "golint", ] pruneopts = "UT" - revision = "d0100b6bd8b389f0385611eb39152c4d7c3a7905" + revision = "959b441ac422379a43da2230f62be024250818b0" [[projects]] branch = "master" - digest = "1:e87f576319e558a57920a69ccdeb7d597f18d5541633c529224c35aa2185e5f4" + digest = "1:2f357867bf425774d35beca5be718402a4488b8b23b1563ce8c5bb91d09285a7" name = "golang.org/x/net" packages = [ "context", @@ -272,11 +201,11 @@ "trace", ] pruneopts = "UT" - revision = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146" + revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938" [[projects]] branch = "master" - digest = "1:645cb780e4f3177111b40588f0a7f5950efcfb473e7ff41d8d81b2ba5eaa6ed5" + digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b" name = "golang.org/x/oauth2" packages = [ ".", @@ -286,32 +215,34 @@ "jwt", ] pruneopts = "UT" - revision = "9f3314589c9a9136388751d9adae6b0ed400978a" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" [[projects]] branch = "master" - digest = "1:75515eedc0dc2cb0b40372008b616fa2841d831c63eedd403285ff286c593295" + digest = "1:382bb5a7fb4034db3b6a2d19e5a4a6bcf52f4750530603c01ca18a172fa3089b" name = "golang.org/x/sync" packages = ["semaphore"] pruneopts = "UT" - revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" + revision = "112230192c580c3556b8cee6403af37a4fc5f28c" [[projects]] branch = "master" - digest = "1:e18c1645adfe83d66f80d3676040e478895669f9456ca8bafa6a7290656c1b48" + digest = "1:a2b03582f5805ebb5d96482a0ea550d48aba5347cc5089d89d2307ac55b98660" name = "golang.org/x/sys" packages = ["unix"] pruneopts = "UT" - revision = "81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2" + revision = "d432491b91382bba9c2a91776aa47c9430183a6f" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -324,12 +255,12 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:11a19bc8bcf4f5bcc5e2aa79a2bdbf5a39d8d812d24f6274390ef781450dc751" + digest = "1:959a78e48dea708230fa7a380ccc3e8019c3aa3537f93019dd3c47b50d0baf48" name = "golang.org/x/tools" packages = [ "cmd/goimports", @@ -342,35 +273,30 @@ "go/loader", "go/packages", "go/types/typeutil", - "imports", "internal/fastwalk", "internal/gopathwalk", + "internal/imports", "internal/module", "internal/semver", ] pruneopts = "UT" - revision = "923d25813098b2ffdf1b4bb7ee4ec425fef796a9" + revision = "6e04913cbbac05c5c0c9d8f237717e292f700e76" [[projects]] - branch = "master" - digest = "1:dd6e1a70c3d069cb58cb5cd234a6aca65c31b87eecce857b0b140aec96fcee91" + digest = "1:ff7d4e127c373418b25aeff20b8bb7f736ab0a560199f07deb7ba156e6d0451b" name = "google.golang.org/api" packages = [ - "googleapi/transport", "internal", - "iterator", "option", "support/bundler", - "transport", "transport/grpc", - "transport/http", - "transport/http/internal/propagation", ] pruneopts = "UT" - revision = "20bbacfccda17c931b527d7194130d41239ca1db" + revision = "aac82e61c0c8fe133c297b4b59316b9f481e1f0a" + version = "v0.6.0" [[projects]] - digest = "1:15b86ee56687b2b842431678dacd1050900cd5ea24a47fa908ac32ce540664b7" + digest = "1:2c26b1c47556c0e5e73cdb05d8361c463737eee4baac35d38b40c728c3074a94" name = "google.golang.org/appengine" packages = [ ".", @@ -387,43 +313,47 @@ "urlfetch", ] pruneopts = "UT" - revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" - version = "v1.5.0" + revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" + version = "v1.6.1" [[projects]] branch = "master" - digest = "1:1bdf7266185c9ea298f4fccd2b3c01861d65c1ab5c3e7618399084e39442a990" + digest = "1:9ba517da3141030aa8476305f6b013b0bf91209ab5905975d540c02dd1d76b97" name = "google.golang.org/genproto" packages = [ - "googleapis/api", "googleapis/api/annotations", - "googleapis/api/distribution", "googleapis/api/httpbody", - "googleapis/api/label", - "googleapis/api/metric", - "googleapis/api/monitoredres", - "googleapis/container/v1", "googleapis/devtools/cloudprofiler/v2", - "googleapis/devtools/cloudtrace/v2", - "googleapis/monitoring/v3", "googleapis/rpc/errdetails", "googleapis/rpc/status", "protobuf/field_mask", ] pruneopts = "UT" - revision = "64821d5d210748c883cd2b809589555ae4654203" + revision = "6af8c5fc6601ab6b41cd32742a65ce2f5bd9db57" [[projects]] - digest = "1:f3fea5ef1fb1f632ae0dd9a86af6aa2048f3243d1da0075706fca1def38d9fbb" + digest = "1:2bad33be652f95f2be27728cde35967b0bf48c5c4bb6b3b52fe8399d3444c740" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", + "balancer/grpclb", + "balancer/grpclb/grpc_lb_v1", "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/alts", + "credentials/alts/internal", + "credentials/alts/internal/authinfo", + "credentials/alts/internal/conn", + "credentials/alts/internal/handshaker", + "credentials/alts/internal/handshaker/service", + "credentials/alts/internal/proto/grpc_gcp", + "credentials/google", + "credentials/internal", "credentials/oauth", "encoding", "encoding/proto", @@ -431,9 +361,13 @@ "health/grpc_health_v1", "internal", "internal/backoff", + "internal/balancerload", + "internal/binarylog", "internal/channelz", "internal/envconfig", "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", "internal/transport", "keepalive", "metadata", @@ -449,8 +383,8 @@ "tap", ] pruneopts = "UT" - revision = "32fb0ac620c32ba40a4626ddf94d90d12cce3455" - version = "v1.14.0" + revision = "501c41df7f472c740d0674ff27122f3f48c80ce7" + version = "v1.21.1" [[projects]] digest = "1:e7f29d557575410f09b303a6270a20f17b2dcb69d3bbc4d71d89f5d8e927416d" @@ -488,18 +422,19 @@ input-imports = [ "cloud.google.com/go/profiler", "contrib.go.opencensus.io/exporter/ocagent", - "contrib.go.opencensus.io/exporter/stackdriver", + "contrib.go.opencensus.io/resource/gke", "github.com/GoogleCloudPlatform/microservices-demo/src/shippingservice/genproto", "github.com/golang/protobuf/proto", "github.com/sirupsen/logrus", - "go.opencensus.io/exporter/jaeger", "go.opencensus.io/plugin/ocgrpc", "go.opencensus.io/stats/view", "go.opencensus.io/trace", "golang.org/x/net/context", "google.golang.org/grpc", + "google.golang.org/grpc/codes", "google.golang.org/grpc/health/grpc_health_v1", "google.golang.org/grpc/reflection", + "google.golang.org/grpc/status", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/src/shippingservice/Gopkg.toml b/src/shippingservice/Gopkg.toml index da02e24..c8bd6ac 100644 --- a/src/shippingservice/Gopkg.toml +++ b/src/shippingservice/Gopkg.toml @@ -31,11 +31,13 @@ [[constraint]] name = "contrib.go.opencensus.io/exporter/ocagent" - version = "0.4.10" + revision = "f9129169651c35ecbdc1186c3ba4aa876ee62e1e" +# version = "0.4.12" [[constraint]] name = "github.com/golang/protobuf" - version = "1.2.0" + revision = "318d17de72747ed1c16502681db4b2bb709a92d0" +# version = "1.2.0" [[constraint]] name = "github.com/sirupsen/logrus" @@ -43,7 +45,7 @@ [[constraint]] name = "go.opencensus.io" - version = "0.20.0" + version = "0.22.0" [[constraint]] branch = "master" @@ -51,7 +53,7 @@ [[constraint]] name = "google.golang.org/grpc" - version = "=1.14.0" + version = "1.15.0" [prune] go-tests = true diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index f653bc2..fd64776 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -21,15 +21,19 @@ import ( "time" "cloud.google.com/go/profiler" + "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opencensus.io/resource/gke" + "github.com/sirupsen/logrus" "go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/stats/view" "go.opencensus.io/trace" "golang.org/x/net/context" "google.golang.org/grpc" + "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" + "google.golang.org/grpc/status" - "contrib.go.opencensus.io/exporter/ocagent" pb "github.com/GoogleCloudPlatform/microservices-demo/src/shippingservice/genproto" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) @@ -84,6 +88,11 @@ func main() { // server controls RPC service responses. type server struct{} +// Watch is unimplemented interface for health checking. +func (s *server) Watch(in *healthpb.HealthCheckRequest, stream healthpb.Health_WatchServer) error { + return status.Error(codes.Unimplemented, codes.Unimplemented.String()) +} + // Check is for health checking. func (s *server) Check(ctx context.Context, req *healthpb.HealthCheckRequest) (*healthpb.HealthCheckResponse, error) { return &healthpb.HealthCheckResponse{Status: healthpb.HealthCheckResponse_SERVING}, nil @@ -137,6 +146,7 @@ func registerOcAgentExporter() { ocaAddr := fmt.Sprintf("%s:%s", ocaHost, "55678") oce, err := ocagent.NewExporter(ocagent.WithInsecure(), + ocagent.WithResourceDetector(gke.Detect), ocagent.WithAddress(ocaAddr)) if err != nil { log.Warnf("Failed to create ocagent-exporter: %v", err)