From ad994ded1655f2b839f072e910ed5cf12db2f689 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 9 Aug 2021 18:15:34 +0200 Subject: [PATCH] more refactoring --- accounts/pkg/tracing/tracing.go | 2 +- glauth/pkg/tracing/tracing.go | 2 +- graph-explorer/pkg/tracing/tracing.go | 2 +- graph/pkg/tracing/tracing.go | 2 +- idp/pkg/tracing/tracing.go | 2 +- ocis-pkg/tracing/tracing.go | 42 +++++++++++++++------------ ocs/pkg/tracing/tracing.go | 2 +- onlyoffice/pkg/tracing/tracing.go | 2 +- proxy/pkg/tracing/tracing.go | 2 +- settings/pkg/tracing/tracing.go | 2 +- store/pkg/tracing/tracing.go | 2 +- thumbnails/pkg/tracing/tracing.go | 2 +- web/pkg/tracing/tracing.go | 2 +- webdav/pkg/tracing/tracing.go | 2 +- 14 files changed, 37 insertions(+), 31 deletions(-) diff --git a/accounts/pkg/tracing/tracing.go b/accounts/pkg/tracing/tracing.go index 678976da9..25408837b 100644 --- a/accounts/pkg/tracing/tracing.go +++ b/accounts/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the proxy service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/glauth/pkg/tracing/tracing.go b/glauth/pkg/tracing/tracing.go index 043ef5804..b721b7574 100644 --- a/glauth/pkg/tracing/tracing.go +++ b/glauth/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the glauth service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/graph-explorer/pkg/tracing/tracing.go b/graph-explorer/pkg/tracing/tracing.go index 228c7c3de..f1e5e3fac 100644 --- a/graph-explorer/pkg/tracing/tracing.go +++ b/graph-explorer/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the proxy service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/graph/pkg/tracing/tracing.go b/graph/pkg/tracing/tracing.go index aea3b9af9..2180fb315 100644 --- a/graph/pkg/tracing/tracing.go +++ b/graph/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the graph service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/idp/pkg/tracing/tracing.go b/idp/pkg/tracing/tracing.go index b94bac504..1bbd6f3b0 100644 --- a/idp/pkg/tracing/tracing.go +++ b/idp/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the idp service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/ocis-pkg/tracing/tracing.go b/ocis-pkg/tracing/tracing.go index acd1cc91f..4ca4c8581 100644 --- a/ocis-pkg/tracing/tracing.go +++ b/ocis-pkg/tracing/tracing.go @@ -11,30 +11,36 @@ import ( ) // Propagator ensures the importer module uses the same trace propagation strategy. -var Propagator propagation.TextMapPropagator +var Propagator = propagation.NewCompositeTextMapPropagator( + propagation.Baggage{}, + propagation.TraceContext{}, +) // GetTraceProvider returns a configured open-telemetry trace provider. func GetTraceProvider(collectorEndpoint, traceType, serviceName string) (*sdktrace.TracerProvider, error) { switch t := traceType; t { case "jaeger": - { - exp, err := jaeger.New( - jaeger.WithCollectorEndpoint( - jaeger.WithEndpoint(collectorEndpoint), - ), - ) - if err != nil { - return nil, err - } - - return sdktrace.NewTracerProvider( - sdktrace.WithBatcher(exp), - sdktrace.WithResource(resource.NewWithAttributes( - semconv.SchemaURL, - semconv.ServiceNameKey.String(serviceName)), - ), - ), nil + if collectorEndpoint == "" { + return sdktrace.NewTracerProvider(), nil } + + exp, err := jaeger.New( + jaeger.WithCollectorEndpoint( + jaeger.WithEndpoint(collectorEndpoint), + ), + ) + if err != nil { + return nil, err + } + + return sdktrace.NewTracerProvider( + sdktrace.WithBatcher(exp), + sdktrace.WithResource(resource.NewWithAttributes( + semconv.SchemaURL, + semconv.ServiceNameKey.String(serviceName)), + ), + ), nil + case "agent": fallthrough case "zipkin": diff --git a/ocs/pkg/tracing/tracing.go b/ocs/pkg/tracing/tracing.go index 8139cae7d..228587b92 100644 --- a/ocs/pkg/tracing/tracing.go +++ b/ocs/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the ocs service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/onlyoffice/pkg/tracing/tracing.go b/onlyoffice/pkg/tracing/tracing.go index 71a1fda67..d775ffa4b 100644 --- a/onlyoffice/pkg/tracing/tracing.go +++ b/onlyoffice/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the onlyoffice service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/proxy/pkg/tracing/tracing.go b/proxy/pkg/tracing/tracing.go index 062ffd246..ee9f3dfcf 100644 --- a/proxy/pkg/tracing/tracing.go +++ b/proxy/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the proxy service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/settings/pkg/tracing/tracing.go b/settings/pkg/tracing/tracing.go index 6821cd24b..bc86e3af1 100644 --- a/settings/pkg/tracing/tracing.go +++ b/settings/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the settings service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/store/pkg/tracing/tracing.go b/store/pkg/tracing/tracing.go index bc97bb7c5..726566224 100644 --- a/store/pkg/tracing/tracing.go +++ b/store/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the store service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/thumbnails/pkg/tracing/tracing.go b/thumbnails/pkg/tracing/tracing.go index 01172bd06..c9c45e5ef 100644 --- a/thumbnails/pkg/tracing/tracing.go +++ b/thumbnails/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the thumbnails service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/web/pkg/tracing/tracing.go b/web/pkg/tracing/tracing.go index faa43f86e..1f788eca2 100644 --- a/web/pkg/tracing/tracing.go +++ b/web/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the web service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error { diff --git a/webdav/pkg/tracing/tracing.go b/webdav/pkg/tracing/tracing.go index 7735e43ad..6f1fbc9ac 100644 --- a/webdav/pkg/tracing/tracing.go +++ b/webdav/pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( var ( // TraceProvider is the global trace provider for the proxy service. - TraceProvider = sdktrace.NewTracerProvider() + TraceProvider *sdktrace.TracerProvider ) func Configure(cfg *config.Config) error {