refactor traceprovider initialization

glauth/pkg/command/server.go

@@ -41,7 +41,7 @@ func Server(cfg *config.Config) *cli.Command {
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 
-			if err := tracing.Configure(cfg, logger); err != nil {
+			if err := tracing.Configure(cfg); err != nil {
 				return err
 			}
 

glauth/pkg/tracing/tracing.go

@@ -2,60 +2,20 @@ package tracing
 
 import (
 	"github.com/owncloud/ocis/glauth/pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/log"
-	"go.opentelemetry.io/otel/exporters/jaeger"
-	"go.opentelemetry.io/otel/propagation"
-	"go.opentelemetry.io/otel/sdk/resource"
+	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
-	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 )
 
 var (
-	// Propagator ensures the entire module uses the same trace propagation strategy.
-	Propagator propagation.TextMapPropagator
-
-	// TraceProvider is the global trace provider for the proxy service.
+	// TraceProvider is the global trace provider for the glauth service.
 	TraceProvider = sdktrace.NewTracerProvider()
 )
 
-func Configure(cfg *config.Config, logger log.Logger) error {
-	if cfg.Tracing.Enabled {
-		switch t := cfg.Tracing.Type; t {
-		case "jaeger":
-			{
-				exp, err := jaeger.New(
-					jaeger.WithCollectorEndpoint(
-						jaeger.WithEndpoint(cfg.Tracing.Collector),
-					),
-				)
-				if err != nil {
-					panic(err)
-				}
-
-				// set package level trace provider and propagator.
-				TraceProvider = sdktrace.NewTracerProvider(
-					sdktrace.WithBatcher(exp),
-					sdktrace.WithResource(resource.NewWithAttributes(
-						semconv.SchemaURL,
-						semconv.ServiceNameKey.String("glauth")),
-					),
-				)
-
-				Propagator = propagation.NewCompositeTextMapPropagator(
-					propagation.Baggage{},
-					propagation.TraceContext{},
-				)
-			}
-		case "agent":
-			fallthrough
-		case "zipkin":
-			fallthrough
-		default:
-			logger.Warn().Str("type", t).Msg("Unknown tracing backend")
-		}
-	} else {
-		logger.Debug().
-			Msg("Tracing is not enabled")
+func Configure(cfg *config.Config) error {
+	var err error
+	if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Collector, cfg.Tracing.Type, "glauth"); err != nil {
+		return err
 	}
+
 	return nil
 }