From eb40aa04608c8e145aae2353455238111ddad184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Tue, 6 Aug 2024 13:36:25 +0200 Subject: [PATCH] feat: include X-WOPI-SessionId header in the logs and tracing --- services/collaboration/pkg/middleware/tracing.go | 1 + services/collaboration/pkg/middleware/wopicontext.go | 1 + 2 files changed, 2 insertions(+) diff --git a/services/collaboration/pkg/middleware/tracing.go b/services/collaboration/pkg/middleware/tracing.go index e4f4b890f..3e90d4df4 100644 --- a/services/collaboration/pkg/middleware/tracing.go +++ b/services/collaboration/pkg/middleware/tracing.go @@ -23,6 +23,7 @@ func CollaborationTracingMiddleware(next http.Handler) http.Handler { wopiUser := wopiContext.User.GetId() attrs := []attribute.KeyValue{ + attribute.String("ocis.wopi.sessionid", r.Header.Get("X-WOPI-SessionId")), attribute.String("ocis.wopi.method", wopiMethod), attribute.String("ocis.wopi.resource.id.storage", wopiFile.GetResourceId().GetStorageId()), attribute.String("ocis.wopi.resource.id.opaque", wopiFile.GetResourceId().GetOpaqueId()), diff --git a/services/collaboration/pkg/middleware/wopicontext.go b/services/collaboration/pkg/middleware/wopicontext.go index 7a02d8e6c..a6dbd13ef 100644 --- a/services/collaboration/pkg/middleware/wopicontext.go +++ b/services/collaboration/pkg/middleware/wopicontext.go @@ -90,6 +90,7 @@ func WopiContextAuthMiddleware(cfg *config.Config, next http.Handler) http.Handl // although some headers might not be sent depending on the client. logger := zerolog.Ctx(ctx) ctx = logger.With(). + Str("WopiSessionId", r.Header.Get("X-WOPI-SessionId")). Str("WopiOverride", r.Header.Get("X-WOPI-Override")). Str("WopiProof", r.Header.Get("X-WOPI-Proof")). Str("WopiProofOld", r.Header.Get("X-WOPI-ProofOld")).