Merge pull request #26339 from vespa-engine/bjorncs/prepare-and-activate

Add application id to access log

1 files changed, 4 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
index ecea7422ce8..4b8d98274ed 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java
@@ -100,6 +100,10 @@ public class ApplicationApiHandler extends SessionHandler {
             compressedStream = createFromCompressedStream(request.getData(), request.getHeader(contentTypeHeader), maxApplicationPackageSize);
         }
 
+        // Aid debugging by adding full application id to access log (since only tenant name is part of the request URI path)
+        request.getAccessLogEntry()
+                .ifPresent(e -> e.addKeyValue("app.id", prepareParams.getApplicationId().toFullString()));
+
         try (compressedStream) {
             PrepareResult result = applicationRepository.deploy(compressedStream, prepareParams);
             return new SessionPrepareAndActivateResponse(result, request, prepareParams.getApplicationId(), zone);