enable traces in proxy

proxy/pkg/proxy/proxy.go

@@ -2,6 +2,7 @@ package proxy
 
 import (
 	"crypto/tls"
+	"fmt"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -10,21 +11,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/owncloud/ocis/proxy/pkg/proxy/policy"
-	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
-	"go.opencensus.io/trace"
-
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/proxy/policy"
+	proxytracing "github.com/owncloud/ocis/proxy/pkg/tracing"
+	"go.opentelemetry.io/otel/trace"
 )
 
-// MultiHostReverseProxy extends httputil to support multiple hosts with diffent policies
+// MultiHostReverseProxy extends "httputil" to support multiple hosts with different policies
 type MultiHostReverseProxy struct {
 	httputil.ReverseProxy
 	Directors      map[string]map[config.RouteType]map[string]func(req *http.Request)
 	PolicySelector policy.Selector
 	logger         log.Logger
-	propagator     tracecontext.HTTPFormat
 	config         *config.Config
 }
 
@@ -214,17 +213,16 @@ func (p *MultiHostReverseProxy) AddHost(policy string, target *url.URL, rt confi
 }
 
 func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-	var span *trace.Span
+	var (
+		ctx  = r.Context()
+		span trace.Span
+	)
 
-	// Start root span.
 	if p.config.Tracing.Enabled {
-		ctx, span = trace.StartSpan(ctx, r.URL.String())
+		tracer := proxytracing.TraceProvider.Tracer("proxy")
+		ctx, span = tracer.Start(ctx, fmt.Sprintf("%s %v", r.Method, r.URL.Path))
 		defer span.End()
-		p.propagator.SpanContextToRequest(span.SpanContext(), r)
 	}
-
-	// Call upstream ServeHTTP
 	p.ReverseProxy.ServeHTTP(w, r.WithContext(ctx))
 }
 

proxy/pkg/tracing/tracing.go

@@ -1,87 +1,58 @@
 package tracing
 
 import (
-	"time"
-
-	"contrib.go.opencensus.io/exporter/jaeger"
-	"contrib.go.opencensus.io/exporter/ocagent"
-	"contrib.go.opencensus.io/exporter/zipkin"
-	openzipkin "github.com/openzipkin/zipkin-go"
-	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
-	"go.opencensus.io/stats/view"
-	"go.opencensus.io/trace"
+	"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.TracerProvider
 )
 
 func Configure(cfg *config.Config, logger log.Logger) error {
 	if cfg.Tracing.Enabled {
 		switch t := cfg.Tracing.Type; t {
-		case "agent":
-			exporter, err := ocagent.NewExporter(
-				ocagent.WithReconnectionPeriod(5*time.Second),
-				ocagent.WithAddress(cfg.Tracing.Endpoint),
-				ocagent.WithServiceName(cfg.Tracing.Service),
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create agent tracing")
-				return err
-			}
-			trace.RegisterExporter(exporter)
-			view.RegisterExporter(exporter)
 		case "jaeger":
-			exporter, err := jaeger.NewExporter(
-				jaeger.Options{
-					AgentEndpoint:     cfg.Tracing.Endpoint,
-					CollectorEndpoint: cfg.Tracing.Collector,
-					Process: jaeger.Process{
-						ServiceName: cfg.Tracing.Service,
-					},
-				},
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create jaeger tracing")
-				return err
+			{
+				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{},
+				)
 			}
-			trace.RegisterExporter(exporter)
+		case "agent":
+			fallthrough
 		case "zipkin":
-			endpoint, err := openzipkin.NewEndpoint(
-				cfg.Tracing.Service,
-				cfg.Tracing.Endpoint,
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create zipkin tracing")
-				return err
-			}
-			exporter := zipkin.NewExporter(
-				zipkinhttp.NewReporter(
-					cfg.Tracing.Collector,
-				),
-				endpoint,
-			)
-			trace.RegisterExporter(exporter)
+			fallthrough
 		default:
-			logger.Warn().
-				Str("type", t).
-				Msg("Unknown tracing backend")
+			logger.Warn().Str("type", t).Msg("Unknown tracing backend")
 		}
-		trace.ApplyConfig(
-			trace.Config{
-				DefaultSampler: trace.AlwaysSample(),
-			},
-		)
 	} else {
 		logger.Debug().
 			Msg("Tracing is not enabled")