From 79be22b86839ffca75c1a9aeaeaa8a972f7d7070 Mon Sep 17 00:00:00 2001 From: Manasseh Mmadu Date: Thu, 9 Jan 2020 15:28:39 +0100 Subject: [PATCH] Updated deps go.opencensus.io/exporter/stackdriver -> contrib.go.opencensus.io/exporter/stackdriver on checkoutservice and shipping service --- src/checkoutservice/Gopkg.lock | 71 ++++++++++++++++------------------ src/checkoutservice/Gopkg.toml | 4 ++ src/checkoutservice/main.go | 2 +- src/shippingservice/Gopkg.lock | 53 ++++++++++++++++--------- src/shippingservice/Gopkg.toml | 4 ++ src/shippingservice/main.go | 2 +- 6 files changed, 78 insertions(+), 58 deletions(-) diff --git a/src/checkoutservice/Gopkg.lock b/src/checkoutservice/Gopkg.lock index a46ae2c..0c0323e 100644 --- a/src/checkoutservice/Gopkg.lock +++ b/src/checkoutservice/Gopkg.lock @@ -9,12 +9,20 @@ "internal/version", "monitoring/apiv3", "profiler", - "trace/apiv2", + "trace/apiv2" ] pruneopts = "UT" revision = "457ea5c15ccf3b87db582c450e80101989da35f7" version = "v0.40.0" +[[projects]] + digest = "1:bcd1b2dd631e720b6129e801bf0766c50fb4d39455c0a255047e8fc71c31152f" + name = "contrib.go.opencensus.io/exporter/jaeger" + packages = ["."] + pruneopts = "UT" + revision = "540daef1da72376e9b3e1d52e4f90403d72f5c00" + version = "v0.2.0" + [[projects]] digest = "1:4b96dcd8534bc6450a922bd16a76360ba3381f0d1daf40abbaec91c053fbfeb5" name = "contrib.go.opencensus.io/exporter/stackdriver" @@ -23,26 +31,6 @@ revision = "37aa2801fbf0205003e15636096ebf0373510288" version = "v0.5.0" -[[projects]] - branch = "master" - digest = "1:a85b0dc359de4812d383ee6670f0dae595cfcb8b13ff6b872bdb013a18c37b07" - name = "git.apache.org/thrift.git" - packages = ["lib/go/thrift"] - pruneopts = "UT" - revision = "286eee16b147a302ddc7b10740c5e5401ebbec17" - source = "github.com/apache/thrift" - -[[projects]] - digest = "1:4287343c81d259e828b2e3b579270139a498a2168fbab81d89c3b9926b4ec740" - name = "github.com/GoogleCloudPlatform/microservices-demo" - packages = [ - "src/checkoutservice/genproto", - "src/checkoutservice/money", - ] - pruneopts = "UT" - revision = "27df445fc20f048c1c31e429f6c29075119fe454" - version = "v0.1.1" - [[projects]] digest = "1:1d3ad0f6a57c08e2168089a64c34313930571fcbe5359d71c608a97ce504f7ca" name = "github.com/golang/protobuf" @@ -55,7 +43,7 @@ "ptypes/empty", "ptypes/struct", "ptypes/timestamp", - "ptypes/wrappers", + "ptypes/wrappers" ] pruneopts = "UT" revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" @@ -102,12 +90,23 @@ version = "v1.4.2" [[projects]] - digest = "1:a5154dfd6b37bef5a3eab759e13296348e639dc8c7604f538368167782b08ccd" + digest = "1:be83cecd5ba066751e3f789c1faecf5a3229031c7986eb486f593a6e32446ac0" + name = "github.com/uber/jaeger-client-go" + packages = [ + "thrift", + "thrift-gen/agent", + "thrift-gen/jaeger", + "thrift-gen/zipkincore" + ] + pruneopts = "UT" + revision = "f2e1f58485aacf2975cdde9c9f5396e6d98c35ba" + version = "v2.21.1" + +[[projects]] + digest = "1:1bb914cfb78f68f488a91cd7872d3d06a5f83c5bbacf0296dbef44e120b00a91" name = "go.opencensus.io" packages = [ ".", - "exporter/jaeger", - "exporter/jaeger/internal/gen-go/jaeger", "internal", "internal/tagencoding", "plugin/ocgrpc", @@ -120,7 +119,7 @@ "trace", "trace/internal", "trace/propagation", - "trace/tracestate", + "trace/tracestate" ] pruneopts = "UT" revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89" @@ -138,7 +137,7 @@ "http2/hpack", "idna", "internal/timeseries", - "trace", + "trace" ] pruneopts = "UT" revision = "da137c7871d730100384dbcf36e6f8fa493aef5b" @@ -152,7 +151,7 @@ "google", "internal", "jws", - "jwt", + "jwt" ] pruneopts = "UT" revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" @@ -192,7 +191,7 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable", + "unicode/rangetable" ] pruneopts = "UT" revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" @@ -211,7 +210,7 @@ "transport", "transport/grpc", "transport/http", - "transport/http/internal/propagation", + "transport/http/internal/propagation" ] pruneopts = "UT" revision = "aae1d1b89c27132abe4fa22731a2a61e7089079c" @@ -231,7 +230,7 @@ "internal/socket", "internal/urlfetch", "socket", - "urlfetch", + "urlfetch" ] pruneopts = "UT" revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" @@ -253,7 +252,7 @@ "googleapis/monitoring/v3", "googleapis/rpc/errdetails", "googleapis/rpc/status", - "protobuf/field_mask", + "protobuf/field_mask" ] pruneopts = "UT" revision = "3bdd9d9f5532d75d09efb230bd767d265245cfe5" @@ -306,7 +305,7 @@ "serviceconfig", "stats", "status", - "tap", + "tap" ] pruneopts = "UT" revision = "1d89a3c832915b2314551c1d2a506874d62e53f7" @@ -317,13 +316,11 @@ analyzer-version = 1 input-imports = [ "cloud.google.com/go/profiler", + "contrib.go.opencensus.io/exporter/jaeger", "contrib.go.opencensus.io/exporter/stackdriver", - "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/genproto", - "github.com/GoogleCloudPlatform/microservices-demo/src/checkoutservice/money", "github.com/golang/protobuf/proto", "github.com/google/uuid", "github.com/sirupsen/logrus", - "go.opencensus.io/exporter/jaeger", "go.opencensus.io/plugin/ocgrpc", "go.opencensus.io/stats/view", "go.opencensus.io/trace", @@ -331,7 +328,7 @@ "google.golang.org/grpc", "google.golang.org/grpc/codes", "google.golang.org/grpc/health/grpc_health_v1", - "google.golang.org/grpc/status", + "google.golang.org/grpc/status" ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/src/checkoutservice/Gopkg.toml b/src/checkoutservice/Gopkg.toml index abac03c..04b9024 100644 --- a/src/checkoutservice/Gopkg.toml +++ b/src/checkoutservice/Gopkg.toml @@ -56,3 +56,7 @@ [prune] go-tests = true unused-packages = true + +[[constraint]] + name = "contrib.go.opencensus.io/exporter/jaeger" + version = "0.2.0" diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 8ba4b8b..269c6d1 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -22,10 +22,10 @@ import ( "time" "cloud.google.com/go/profiler" + "contrib.go.opencensus.io/exporter/jaeger" "contrib.go.opencensus.io/exporter/stackdriver" "github.com/google/uuid" "github.com/sirupsen/logrus" - "go.opencensus.io/exporter/jaeger" "go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/stats/view" "go.opencensus.io/trace" diff --git a/src/shippingservice/Gopkg.lock b/src/shippingservice/Gopkg.lock index e30bd89..ef4b7c1 100644 --- a/src/shippingservice/Gopkg.lock +++ b/src/shippingservice/Gopkg.lock @@ -9,12 +9,20 @@ "internal/version", "monitoring/apiv3", "profiler", - "trace/apiv2", + "trace/apiv2" ] pruneopts = "UT" revision = "457ea5c15ccf3b87db582c450e80101989da35f7" version = "v0.40.0" +[[projects]] + digest = "1:bcd1b2dd631e720b6129e801bf0766c50fb4d39455c0a255047e8fc71c31152f" + name = "contrib.go.opencensus.io/exporter/jaeger" + packages = ["."] + pruneopts = "UT" + revision = "540daef1da72376e9b3e1d52e4f90403d72f5c00" + version = "v0.2.0" + [[projects]] digest = "1:4b96dcd8534bc6450a922bd16a76360ba3381f0d1daf40abbaec91c053fbfeb5" name = "contrib.go.opencensus.io/exporter/stackdriver" @@ -32,14 +40,6 @@ revision = "286eee16b147a302ddc7b10740c5e5401ebbec17" source = "github.com/apache/thrift" -[[projects]] - digest = "1:f47f56c0975afe777b239cc03631011db2667a51e59b177bf318748724d4455b" - name = "github.com/GoogleCloudPlatform/microservices-demo" - packages = ["src/shippingservice/genproto"] - pruneopts = "UT" - revision = "27df445fc20f048c1c31e429f6c29075119fe454" - version = "v0.1.1" - [[projects]] digest = "1:1d3ad0f6a57c08e2168089a64c34313930571fcbe5359d71c608a97ce504f7ca" name = "github.com/golang/protobuf" @@ -52,7 +52,7 @@ "ptypes/empty", "ptypes/struct", "ptypes/timestamp", - "ptypes/wrappers", + "ptypes/wrappers" ] pruneopts = "UT" revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" @@ -90,6 +90,19 @@ revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" version = "v1.4.2" +[[projects]] + digest = "1:be83cecd5ba066751e3f789c1faecf5a3229031c7986eb486f593a6e32446ac0" + name = "github.com/uber/jaeger-client-go" + packages = [ + "thrift", + "thrift-gen/agent", + "thrift-gen/jaeger", + "thrift-gen/zipkincore" + ] + pruneopts = "UT" + revision = "f2e1f58485aacf2975cdde9c9f5396e6d98c35ba" + version = "v2.21.1" + [[projects]] digest = "1:a5154dfd6b37bef5a3eab759e13296348e639dc8c7604f538368167782b08ccd" name = "go.opencensus.io" @@ -109,7 +122,7 @@ "trace", "trace/internal", "trace/propagation", - "trace/tracestate", + "trace/tracestate" ] pruneopts = "UT" revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89" @@ -127,7 +140,7 @@ "http2/hpack", "idna", "internal/timeseries", - "trace", + "trace" ] pruneopts = "UT" revision = "da137c7871d730100384dbcf36e6f8fa493aef5b" @@ -141,7 +154,7 @@ "google", "internal", "jws", - "jwt", + "jwt" ] pruneopts = "UT" revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" @@ -181,7 +194,7 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable", + "unicode/rangetable" ] pruneopts = "UT" revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" @@ -200,7 +213,7 @@ "transport", "transport/grpc", "transport/http", - "transport/http/internal/propagation", + "transport/http/internal/propagation" ] pruneopts = "UT" revision = "aae1d1b89c27132abe4fa22731a2a61e7089079c" @@ -220,7 +233,7 @@ "internal/socket", "internal/urlfetch", "socket", - "urlfetch", + "urlfetch" ] pruneopts = "UT" revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" @@ -242,7 +255,7 @@ "googleapis/monitoring/v3", "googleapis/rpc/errdetails", "googleapis/rpc/status", - "protobuf/field_mask", + "protobuf/field_mask" ] pruneopts = "UT" revision = "3bdd9d9f5532d75d09efb230bd767d265245cfe5" @@ -297,7 +310,7 @@ "serviceconfig", "stats", "status", - "tap", + "tap" ] pruneopts = "UT" revision = "1d89a3c832915b2314551c1d2a506874d62e53f7" @@ -308,8 +321,8 @@ analyzer-version = 1 input-imports = [ "cloud.google.com/go/profiler", + "contrib.go.opencensus.io/exporter/jaeger", "contrib.go.opencensus.io/exporter/stackdriver", - "github.com/GoogleCloudPlatform/microservices-demo/src/shippingservice/genproto", "github.com/golang/protobuf/proto", "github.com/sirupsen/logrus", "go.opencensus.io/exporter/jaeger", @@ -318,8 +331,10 @@ "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 f11397f..2c32741 100644 --- a/src/shippingservice/Gopkg.toml +++ b/src/shippingservice/Gopkg.toml @@ -52,3 +52,7 @@ [prune] go-tests = true unused-packages = true + +[[constraint]] + name = "contrib.go.opencensus.io/exporter/jaeger" + version = "0.2.0" diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index 29a93d5..c0133f1 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -21,9 +21,9 @@ import ( "time" "cloud.google.com/go/profiler" + "contrib.go.opencensus.io/exporter/jaeger" "contrib.go.opencensus.io/exporter/stackdriver" "github.com/sirupsen/logrus" - "go.opencensus.io/exporter/jaeger" "go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/stats/view" "go.opencensus.io/trace"