enable traces in proxy

ocis-pkg/middleware/tracing.go

@@ -1,31 +1,21 @@
 package middleware
 
 import (
-	"context"
 	"net/http"
 
-	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
-	"go.opencensus.io/trace"
+	"go.opentelemetry.io/otel/propagation"
+)
+
+var propagator = propagation.NewCompositeTextMapPropagator(
+	propagation.Baggage{},
+	propagation.TraceContext{},
 )
 
 // Trace unpacks the request context looking for an existing trace id.
 func Trace(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		var ctx context.Context
-		var span *trace.Span
-
-		tc := tracecontext.HTTPFormat{}
-		// reconstruct span context from request
-		if sc, ok := tc.SpanContextFromRequest(r); ok {
-			// if there is one, add it to the new span
-			ctx, span = trace.StartSpanWithRemoteParent(r.Context(), r.URL.String(), sc)
-			defer span.End()
-		} else {
-			// create a new span if there is no context
-			ctx, span = trace.StartSpan(r.Context(), r.URL.String())
-			defer span.End()
-		}
-
+		ctx := propagator.Extract(r.Context(), propagation.HeaderCarrier(r.Header))
+		propagator.Inject(ctx, propagation.HeaderCarrier(r.Header))
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }