Also log the traceid alongside the request id (owncloud#8023)

* Also log the traceid alongside the request id * Add changelog
2403905 · Jan 24, 2024 · 7917fa7 · 7917fa7
1 parent 07dc6e3
commit 7917fa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog/unreleased/fix-empty-traceids.md b/changelog/unreleased/fix-empty-traceids.md
@@ -2,4 +2,5 @@ Bugfix: Fix empty trace ids
 
 We changed the default tracing to produce non-empty traceids.
 
+https://github.com/owncloud/ocis/pull/8023
 https://github.com/owncloud/ocis/pull/8017
diff --git a/services/proxy/pkg/middleware/accesslog.go b/services/proxy/pkg/middleware/accesslog.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // AccessLog is a middleware to log http requests at info level logging.
@@ -19,9 +20,11 @@ func AccessLog(logger log.Logger) func(http.Handler) http.Handler {
 			wrap := middleware.NewWrapResponseWriter(w, r.ProtoMajor)
 			next.ServeHTTP(wrap, r)
 
+			spanContext := trace.SpanContextFromContext(r.Context())
 			logger.Info().
 				Str("proto", r.Proto).
 				Str(log.RequestIDString, requestID).
+				Str("traceid", spanContext.TraceID().String()).
 				Str("remote-addr", r.RemoteAddr).
 				Str("method", r.Method).
 				Int("status", wrap.Status()).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,5 @@ Bugfix: Fix empty trace ids

		We changed the default tracing to produce non-empty traceids.

		https://github.com/owncloud/ocis/pull/8023
		https://github.com/owncloud/ocis/pull/8017