[sling-org-apache-sling-tracer] 05/30: SLING-5459 - Recording of tracer logs

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tracer-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tracer.git

commit eb0d0c0365938ecb081c4433568398e68e5f7897
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Tue Feb 2 11:00:56 2016 +0000

    SLING-5459 - Recording of tracer logs
    
    Tracer servlet would now send a protocol version version against header 'Sling-Tracer-Protocol-Version'. For now its value is 1. This would allow client to determine if they can work against this server or not
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/tracer@1728082 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/tracer/internal/TracerLogServlet.java   | 8 ++++++--
 .../org/apache/sling/tracer/internal/TracerLogServletTest.java    | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java b/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java
index dd50def..479f6dc 100644
--- a/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java
+++ b/src/main/java/org/apache/sling/tracer/internal/TracerLogServlet.java
@@ -46,6 +46,10 @@ class TracerLogServlet extends SimpleWebConsolePlugin implements TraceLogRecorde
 
     public static final String HEADER_TRACER_REQUEST_ID = "Sling-Tracer-Request-Id";
 
+    public static final String HEADER_TRACER_PROTOCOL_VERSION = "Sling-Tracer-Protocol-Version";
+
+    public static final int TRACER_PROTOCOL_VERSION = 1;
+
     private final Cache<String, JSONRecording> cache;
 
     public TracerLogServlet(BundleContext context) {
@@ -161,8 +165,8 @@ class TracerLogServlet extends SimpleWebConsolePlugin implements TraceLogRecorde
         request.setAttribute(ATTR_REQUEST_ID, requestId);
 
         response.setHeader(HEADER_TRACER_REQUEST_ID, requestId);
-        //TODO Show we also sent tracer version to enable client determine
-        //is server is capable of given version
+        response.setHeader(HEADER_TRACER_PROTOCOL_VERSION, String.valueOf(TRACER_PROTOCOL_VERSION));
+
         return recording;
     }
 
diff --git a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java
index 21f7dcb..5a3c24b 100644
--- a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java
+++ b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java
@@ -98,6 +98,8 @@ public class TracerLogServletTest {
 
         ArgumentCaptor<String> requestIdCaptor = ArgumentCaptor.forClass(String.class);
         verify(response).setHeader(eq(TracerLogServlet.HEADER_TRACER_REQUEST_ID), requestIdCaptor.capture());
+        verify(response).setHeader(TracerLogServlet.HEADER_TRACER_PROTOCOL_VERSION,
+                String.valueOf(TracerLogServlet.TRACER_PROTOCOL_VERSION));
 
         StringWriter sw = new StringWriter();
         when(response.getWriter()).thenReturn(new PrintWriter(sw));

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.