Merge branch 'master' into 1341-tracestate-in-samplingresult

open-telemetry · Jan 6, 2021 · cb6c980 · cb6c980
2 parents b332d2a + db06c8d
commit cb6c980
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/example/otel-collector/main.go b/example/otel-collector/main.go
@@ -88,9 +88,12 @@ func initProvider() func() {
 	pusher.Start()
 
 	return func() {
-		handleErr(tracerProvider.Shutdown(ctx), "failed to shutdown provider")
+		// Shutdown will flush any remaining spans.
+		handleErr(tracerProvider.Shutdown(ctx), "failed to shutdown TracerProvider")
+
+		// Push any last metric events to the exporter.
+		pusher.Stop()
 		handleErr(exp.Shutdown(ctx), "failed to stop exporter")
-		pusher.Stop() // pushes any last exports to the receiver
 	}
 }
 

diff --git a/trace.go b/trace.go
@@ -27,7 +27,7 @@ func Tracer(name string) trace.Tracer {
 	return GetTracerProvider().Tracer(name)
 }
 
-// TracerProvider returns the registered global trace provider.
+// GetTracerProvider returns the registered global trace provider.
 // If none is registered then an instance of NoopTracerProvider is returned.
 //
 // Use the trace provider to create a named tracer. E.g.