From b4a0c0458a4ad0a9a1a938b03d9f0e2ad2aa7c28 Mon Sep 17 00:00:00 2001
From: idafurjes <36131195+idafurjes@users.noreply.github.com>
Date: Mon, 15 Aug 2022 10:47:08 +0200
Subject: [PATCH] Tracing: Fix OpenTelemetry Jaeger context propagation
 (#53269) (#53724)

* fix otel jaeger context propagation

* add back launch.json

* add back launch.json

(cherry picked from commit 806fb8ab7ac7cf633aef48a3c43e87bccf1977a8)

Co-authored-by: zhichli <57812115+zhichli@users.noreply.github.com>
---
 pkg/infra/tracing/opentelemetry_tracing.go | 4 ++--
 pkg/middleware/request_tracing.go          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/infra/tracing/opentelemetry_tracing.go b/pkg/infra/tracing/opentelemetry_tracing.go
index e502b9350ba..1e0da774cb9 100644
--- a/pkg/infra/tracing/opentelemetry_tracing.go
+++ b/pkg/infra/tracing/opentelemetry_tracing.go
@@ -96,11 +96,11 @@ func (ots *Opentelemetry) parseSettingsOpentelemetry() error {
 	ots.enabled = noopExporter
 
 	ots.address = section.Key("address").MustString("")
+	ots.propagation = section.Key("propagation").MustString("")
 	if ots.address != "" {
 		ots.enabled = jaegerExporter
 		return nil
 	}
-	ots.propagation = section.Key("propagation").MustString("")
 
 	section, err = ots.Cfg.Raw.GetSection("tracing.opentelemetry.otlp")
 	if err != nil {
@@ -234,7 +234,7 @@ func (ots *Opentelemetry) Run(ctx context.Context) error {
 }
 
 func (ots *Opentelemetry) Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, Span) {
-	ctx, span := ots.tracer.Start(ctx, spanName)
+	ctx, span := ots.tracer.Start(ctx, spanName, opts...)
 	opentelemetrySpan := OpentelemetrySpan{
 		span: span,
 	}
diff --git a/pkg/middleware/request_tracing.go b/pkg/middleware/request_tracing.go
index dcfce62fabe..30983d897a5 100644
--- a/pkg/middleware/request_tracing.go
+++ b/pkg/middleware/request_tracing.go
@@ -73,7 +73,7 @@ func RequestTracing(tracer tracing.Tracer) web.Handler {
 		rw := res.(web.ResponseWriter)
 
 		wireContext := otel.GetTextMapPropagator().Extract(req.Context(), propagation.HeaderCarrier(req.Header))
-		ctx, span := tracer.Start(req.Context(), fmt.Sprintf("HTTP %s %s", req.Method, req.URL.Path), trace.WithLinks(trace.LinkFromContext(wireContext)))
+		ctx, span := tracer.Start(wireContext, fmt.Sprintf("HTTP %s %s", req.Method, req.URL.Path), trace.WithLinks(trace.LinkFromContext(wireContext)))
 
 		c.Req = req.WithContext(ctx)
 		c.Next()