log traceid for trace api

optimizely · Dec 11, 2023 · 59b6382 · 59b6382
1 parent 216fcd4
commit 59b6382
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/handlers/activate.go b/pkg/handlers/activate.go
@@ -22,13 +22,12 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/go-chi/render"
+
 	"github.com/optimizely/agent/pkg/middleware"
 	"github.com/optimizely/agent/pkg/optimizely"
-
 	"github.com/optimizely/go-sdk/pkg/config"
 	"github.com/optimizely/go-sdk/pkg/entities"
-
-	"github.com/go-chi/render"
 )
 
 type keyMap map[string]string

diff --git a/pkg/handlers/track.go b/pkg/handlers/track.go
@@ -22,9 +22,10 @@ import (
 	"net/http"
 
 	"github.com/go-chi/render"
-	"github.com/optimizely/go-sdk/pkg/entities"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/optimizely/agent/pkg/middleware"
+	"github.com/optimizely/go-sdk/pkg/entities"
 )
 
 type trackBody struct {
@@ -40,6 +41,8 @@ func TrackEvent(w http.ResponseWriter, r *http.Request) {
 		RenderError(err, http.StatusInternalServerError, w, r)
 		return
 	}
+	logger := middleware.GetLogger(r)
+	span := trace.SpanFromContext(r.Context())
 
 	var body trackBody
 	err = ParseRequestBody(r, &body)
@@ -66,6 +69,6 @@ func TrackEvent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	middleware.GetLogger(r).Debug().Str("eventKey", eventKey).Msg("tracking event")
+	logger.Info().Str("traceID", span.SpanContext().TraceID().String()).Str("spanID", span.SpanContext().SpanID().String()).Str("eventKey", eventKey).Msg("tracked event")
 	render.JSON(w, r, track)
 }