martian(context): add trace id to context.Context when wrapping marti…

…an.Context there
saucelabs · Sep 7, 2023 · b76ca56 · b76ca56
1 parent 235e635
commit b76ca56
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/internal/martian/context.go b/internal/martian/context.go
@@ -24,6 +24,8 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/saucelabs/forwarder/internal/martian/log"
 )
 
 // Context provides information and storage for a single request/response pair.
@@ -183,7 +185,8 @@ func (ctx *Context) addToContext(rctx context.Context) context.Context {
 	if rctx == nil {
 		rctx = context.Background()
 	}
-	return context.WithValue(rctx, martianKey, ctx)
+	mctx := context.WithValue(rctx, martianKey, ctx)
+	return context.WithValue(mctx, log.TraceContextKey, ctx.ID())
 }
 
 // Session returns the session for the context.