refactor traceprovider initialization

proxy/pkg/command/server.go

@@ -59,7 +59,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
 			}
 

proxy/pkg/proxy/proxy.go

@@ -11,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
+
 	"go.opentelemetry.io/otel/propagation"
 
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -224,7 +226,7 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
 		tracer := proxytracing.TraceProvider.Tracer("proxy")
 		ctx, span = tracer.Start(ctx, fmt.Sprintf("%s %v", r.Method, r.URL.Path))
 		defer span.End()
-		proxytracing.Propagator.Inject(ctx, propagation.HeaderCarrier(r.Header))
+		pkgtrace.Propagator.Inject(ctx, propagation.HeaderCarrier(r.Header))
 	}
 
 	p.ReverseProxy.ServeHTTP(w, r.WithContext(ctx))

proxy/pkg/tracing/tracing.go

@@ -1,61 +1,21 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/ocis-pkg/log"
+	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	"go.opentelemetry.io/otel/exporters/jaeger"
-	"go.opentelemetry.io/otel/propagation"
-	"go.opentelemetry.io/otel/sdk/resource"
 	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 = 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("proxy")),
-					),
-				)
-
-				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, "proxy"); err != nil {
+		return err
 	}
+
 	return nil
 }