Upgrade to newest version of sd exporter

src/productcatalogservice/Gopkg.lock

@@ -2,10 +2,11 @@
 
 
 [[projects]]
-  digest = "1:cd61c288406d5d80572967f908a23a1f0ffbf460e926269672e955f4a88b79bc"
+  digest = "1:9097d59af752a760c8967f4b4fca96bb99780659f8e65852869315f64afbf698"
   name = "cloud.google.com/go"
   packages = [
     "compute/metadata",
+    "container/apiv1",
     "internal/version",
     "monitoring/apiv3",
     "profiler",
@@ -16,21 +17,15 @@
   version = "v0.40.0"
 
 [[projects]]
-  digest = "1:4b96dcd8534bc6450a922bd16a76360ba3381f0d1daf40abbaec91c053fbfeb5"
+  digest = "1:fc98782bece7d3f842d991c4ce3f44dd893f9dc521a1d5fd895be9ad271e579f"
   name = "contrib.go.opencensus.io/exporter/stackdriver"
-  packages = ["."]
+  packages = [
+    ".",
+    "monitoredresource",
+  ]
   pruneopts = "UT"
-  revision = "37aa2801fbf0205003e15636096ebf0373510288"
+  revision = "ab68e2a40809b13b9e06ac2135d2549a6a984d62"
-  version = "v0.5.0"
+  version = "v0.13.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:9370265bab17bdc207051ccedc34535484a12622a329839e580059c79236c1e3"
@@ -40,6 +35,70 @@
   revision = "27df445fc20f048c1c31e429f6c29075119fe454"
   version = "v0.1.1"
 
+[[projects]]
+  digest = "1:ab38300d0d784fd866aa476ba641be5910a5e98dcf5662cd7a9153beeae58db0"
+  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/context",
+    "internal/ini",
+    "internal/sdkio",
+    "internal/sdkmath",
+    "internal/sdkrand",
+    "internal/sdkuri",
+    "internal/shareddefaults",
+    "internal/strings",
+    "internal/sync/singleflight",
+    "private/protocol",
+    "private/protocol/json/jsonutil",
+    "private/protocol/query",
+    "private/protocol/query/queryutil",
+    "private/protocol/rest",
+    "private/protocol/xml/xmlutil",
+    "service/sts",
+    "service/sts/stsiface",
+  ]
+  pruneopts = "UT"
+  revision = "b10ba9d2bd8ef2b0602dc19c779b558ed96171d9"
+  version = "v1.29.28"
+
+[[projects]]
+  digest = "1:e7d26760c4e7d67a443b082153c4b473ad0b8f7388302a2f788b1360f751abb8"
+  name = "github.com/census-instrumentation/opencensus-proto"
+  packages = [
+    "gen-go/agent/common/v1",
+    "gen-go/metrics/v1",
+    "gen-go/resource/v1",
+  ]
+  pruneopts = "UT"
+  revision = "d89fa54de508111353cb0b06403c00569be780d8"
+  version = "v0.2.1"
+
+[[projects]]
+  branch = "master"
+  digest = "1:b7cb6054d3dff43b38ad2e92492f220f57ae6087ee797dca298139776749ace8"
+  name = "github.com/golang/groupcache"
+  packages = ["lru"]
+  pruneopts = "UT"
+  revision = "8c9f03a8e57eb486e42badaed3fb287da51807ba"
+
 [[projects]]
   digest = "1:fd0a0705475581c7eb965259d417706cb49f42bde408502c3b53f139b7253d67"
   name = "github.com/golang/protobuf"
@@ -88,6 +147,13 @@
   revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"
   version = "v2.0.5"
 
+[[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"
@@ -105,17 +171,21 @@
   version = "v1.4.2"
 
 [[projects]]
-  digest = "1:a5154dfd6b37bef5a3eab759e13296348e639dc8c7604f538368167782b08ccd"
+  digest = "1:d0d90c1767b8e8a44b9bb1c5982a71e3edfd566adf49120d34f90d78a98ee362"
   name = "go.opencensus.io"
   packages = [
     ".",
-    "exporter/jaeger",
+    "examples/exporter",
-    "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",
@@ -126,8 +196,8 @@
     "trace/tracestate",
   ]
   pruneopts = "UT"
-  revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89"
+  revision = "d835ff86be02193d324330acdb7d65546b05f814"
-  version = "v0.16.0"
+  version = "v0.22.3"
 
 [[projects]]
   branch = "master"
@@ -242,7 +312,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:cb0f37e3cdf50a27abbf33a48797b30786239d4fd69dbfbbc63cfa19d400d3ce"
+  digest = "1:06a1b664fc7b1273b1b92d62da7660c0ece22be782a6004d3d42e5116b67ee25"
   name = "google.golang.org/genproto"
   packages = [
     "googleapis/api",
@@ -251,6 +321,7 @@
     "googleapis/api/label",
     "googleapis/api/metric",
     "googleapis/api/monitoredres",
+    "googleapis/container/v1",
     "googleapis/devtools/cloudprofiler/v2",
     "googleapis/devtools/cloudtrace/v2",
     "googleapis/monitoring/v3",
@@ -321,12 +392,13 @@
   input-imports = [
     "cloud.google.com/go/profiler",
     "contrib.go.opencensus.io/exporter/stackdriver",
+    "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource",
     "github.com/GoogleCloudPlatform/microservices-demo/src/productcatalogservice/genproto",
     "github.com/golang/protobuf/jsonpb",
     "github.com/golang/protobuf/proto",
     "github.com/google/go-cmp/cmp",
     "github.com/sirupsen/logrus",
-    "go.opencensus.io/exporter/jaeger",
+    "go.opencensus.io/examples/exporter",
     "go.opencensus.io/plugin/ocgrpc",
     "go.opencensus.io/stats/view",
     "go.opencensus.io/trace",

src/productcatalogservice/Gopkg.toml

@@ -31,7 +31,7 @@
 
 [[constraint]]
   name = "contrib.go.opencensus.io/exporter/stackdriver"
-  version = "0.5.0"
+  version = "0.13.0"
 
 [[constraint]]
   name = "github.com/golang/protobuf"
@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "go.opencensus.io"
-  version = "0.16.0"
+  version = "0.22.3"
 
 [[constraint]]
   branch = "master"

src/productcatalogservice/server.go

@@ -32,10 +32,12 @@ import (
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 
 	"cloud.google.com/go/profiler"
-	"contrib.go.opencensus.io/exporter/stackdriver"
+    "contrib.go.opencensus.io/exporter/stackdriver"
+    "contrib.go.opencensus.io/exporter/stackdriver/monitoredresource"
+    "go.opencensus.io/examples/exporter"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/sirupsen/logrus"
-	"go.opencensus.io/exporter/jaeger"
+	// "go.opencensus.io/exporter/jaeger"
 	"go.opencensus.io/plugin/ocgrpc"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
@@ -148,30 +150,31 @@ func run(port string) string {
 	return l.Addr().String()
 }
 
-func initJaegerTracing() {
+// func initJaegerTracing() {
-	svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
+// 	svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
-	if svcAddr == "" {
+// 	if svcAddr == "" {
-		log.Info("jaeger initialization disabled.")
+// 		log.Info("jaeger initialization disabled.")
-		return
+// 		return
-	}
+// 	}
-	// Register the Jaeger exporter to be able to retrieve
+// 	// Register the Jaeger exporter to be able to retrieve
-	// the collected spans.
+// 	// the collected spans.
-	exporter, err := jaeger.NewExporter(jaeger.Options{
+// 	exporter, err := jaeger.NewExporter(jaeger.Options{
-		Endpoint: fmt.Sprintf("http://%s", svcAddr),
+// 		Endpoint: fmt.Sprintf("http://%s", svcAddr),
-		Process: jaeger.Process{
+// 		Process: jaeger.Process{
-			ServiceName: "productcatalogservice",
+// 			ServiceName: "productcatalogservice",
-		},
+// 		},
-	})
+// 	})
-	if err != nil {
+// 	if err != nil {
-		log.Fatal(err)
+// 		log.Fatal(err)
-	}
+// 	}
-	trace.RegisterExporter(exporter)
+// 	trace.RegisterExporter(exporter)
-	log.Info("jaeger initialization completed.")
+// 	log.Info("jaeger initialization completed.")
-}
+// }
 
 func initStats(exporter *stackdriver.Exporter) {
-	view.SetReportingPeriod(60 * time.Second)
+    view.SetReportingPeriod(60 * time.Second)
-	view.RegisterExporter(exporter)
+    exporter.StartMetricsExporter()
+    // view.RegisterExporter(exporter) X
 	if err := view.Register(ocgrpc.DefaultServerViews...); err != nil {
 		log.Info("Error registering default server views")
 	} else {
@@ -183,11 +186,15 @@ func initStackdriverTracing() {
 	// TODO(ahmetb) this method is duplicated in other microservices using Go
 	// since they are not sharing packages.
 	for i := 1; i <= 3; i++ {
-		exporter, err := stackdriver.NewExporter(stackdriver.Options{})
+        view.RegisterExporter(&exporter.PrintExporter{})
+		exporter, err := stackdriver.NewExporter(stackdriver.Options{
+            ProjectID:         "test-exemplar-project", // Google Cloud Console project ID for stackdriver.
+            MonitoredResource: monitoredresource.Autodetect(),
+        })
 		if err != nil {
 			log.Warnf("failed to initialize Stackdriver exporter: %+v", err)
 		} else {
-			trace.RegisterExporter(exporter)
+			// trace.RegisterExporter(exporter)
 			trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
 			log.Info("registered Stackdriver tracing")
 
@@ -203,7 +210,7 @@ func initStackdriverTracing() {
 }
 
 func initTracing() {
-	initJaegerTracing()
+	// initJaegerTracing()
 	initStackdriverTracing()
 }