remaining comments from dapr#4808 addressed (dapr#5193)

Signed-off-by: Juan Carlos Zamora <[email protected]>

Signed-off-by: Juan Carlos Zamora <[email protected]>
Co-authored-by: Yaron Schneider <[email protected]>

Author: juazasan

pkg/runtime/runtime.go

@@ -363,7 +363,7 @@ func (a *DaprRuntime) setupTracing(hostAddress string, tpStore tracerProviderSto
 			}
 			client = otlptracegrpc.NewClient(clientOptions...)
 		}
-		otelExporter, err := otlptrace.New(context.Background(), client)
+		otelExporter, err := otlptrace.New(a.ctx, client)
 		if err != nil {
 			return err
 		}
@@ -2403,11 +2403,17 @@ func (a *DaprRuntime) Shutdown(duration time.Duration) {
 			log.Warnf("error closing API: %v", err)
 		}
 	}
-	if a.tracerProvider != nil {
-		a.tracerProvider.Shutdown(context.Background())
-	}
+
+	shutdownCtx, shutdownCancel := context.WithCancel(context.Background())
+	go func() {
+		if a.tracerProvider != nil {
+			a.tracerProvider.Shutdown(shutdownCtx)
+		}
+	}()
+
 	log.Infof("Waiting %s to finish outstanding operations", duration)
 	<-time.After(duration)
+	shutdownCancel()
 	a.shutdownOutputComponents()
 	a.shutdownC <- nil
 }

pkg/runtime/trace.go

@@ -56,7 +56,6 @@ func (s *opentelemetryTracerProviderStore) RegisterResource(res *resource.Resour
 }
 
 // RegisterSampler adds a custom sampler for registration with open telemetry global trace provider
-
 func (s *opentelemetryTracerProviderStore) RegisterSampler(sampler sdktrace.Sampler) {
 	s.sampler = sampler
 }
@@ -110,7 +109,6 @@ func (s *fakeTracerProviderStore) RegisterResource(res *resource.Resource) {
 }
 
 // RegisterSampler adds a custom sampler for registration with open telemetry global trace provider
-
 func (s *fakeTracerProviderStore) RegisterSampler(sampler sdktrace.Sampler) {
 	s.sampler = sampler
 }