From 8565b69398e9de0ce818541ca917227011a0e9bd Mon Sep 17 00:00:00 2001
From: Charlie Roche <charlie@middleware.se>
Date: Tue, 6 Apr 2021 15:55:14 +0200
Subject: [PATCH 1/3] Upgraded to jaeger-client 1.5.0

---
 backend/pom.xml                               |  2 +-
 .../examples/backend/BackendHttpServlet.java  | 43 +++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index fe699f2..fd3f4e5 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>io.jaegertracing</groupId>
             <artifactId>jaeger-client</artifactId>
-            <version>0.32.0</version>
+            <version>1.5.0</version>
         </dependency>
 
     </dependencies>
diff --git a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
index d37f4fa..709f90c 100644
--- a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
+++ b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
@@ -42,12 +42,16 @@
 @WebServlet(urlPatterns = {"/api/backend"})
 public class BackendHttpServlet extends HttpServlet {
 
+    private static final long serialVersionUID = 4006299593098166183L;
+
     private Tracer tracer = TracerResolver.resolveTracer();
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
 
+        System.out.println("Calling backend service");
+        
         //Place the HTTP headers in a Hashmap
         final HashMap<String, String> headers = new HashMap<String, String>();
         Enumeration<String> headerNames = req.getHeaderNames();
@@ -56,33 +60,36 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             String value = req.getHeader(name);
             headers.put(name, value);
         }
+
         //Extract the Parent Span from the headers
         SpanContext parentSpan = tracer
                 .extract(Format.Builtin.HTTP_HEADERS,
-                        new TextMapExtractAdapter(headers));
+                    new TextMapAdapter(headers));
 
         //Start a new Span as a Child of the Parent Span
-        Scope scope = tracer
+        Span span = tracer
                 .buildSpan("backend-servlet")
                 .asChildOf(parentSpan)
-                .startActive(true);
-
-        resp.setContentType("application/json");
+                .start();
 
-        ObjectMapper mapper = new ObjectMapper();
-        String greeting = req.getParameter("greeting");
+        try (Scope scope = tracer.scopeManager().activate(span)) {
+            resp.setContentType("application/json");
 
-        ResponseDTO response = new ResponseDTO();
-        response.setGreeting(greeting +
-                " from cluster Backend");
-        response.setTime(System.currentTimeMillis());
-        response.setIp(getIp());
-
-        PrintWriter out = resp.getWriter();
-        mapper.writerWithDefaultPrettyPrinter()
-                .writeValue(out, response);
-
-        scope.span().finish();
+            ObjectMapper mapper = new ObjectMapper();
+            String greeting = req.getParameter("greeting");
+    
+            ResponseDTO response = new ResponseDTO();
+            response.setGreeting(greeting +
+                    " from cluster Backend");
+            response.setTime(System.currentTimeMillis());
+            response.setIp(getIp());
+    
+            PrintWriter out = resp.getWriter();
+            mapper.writerWithDefaultPrettyPrinter()
+                    .writeValue(out, response);
+        } finally {
+            span.finish();
+        }
     }
 
     private String getIp() {

From 9e35324438b347617f3bb2a9946c59a730905809 Mon Sep 17 00:00:00 2001
From: Charlie Roche <charlie@middleware.se>
Date: Tue, 6 Apr 2021 16:02:03 +0200
Subject: [PATCH 2/3] Removed comment

---
 .../java/com/redhat/examples/backend/BackendHttpServlet.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
index 709f90c..7bb10b0 100644
--- a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
+++ b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
@@ -50,8 +50,6 @@ public class BackendHttpServlet extends HttpServlet {
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
 
-        System.out.println("Calling backend service");
-        
         //Place the HTTP headers in a Hashmap
         final HashMap<String, String> headers = new HashMap<String, String>();
         Enumeration<String> headerNames = req.getHeaderNames();

From e80318087deabf94154c1b4d18475a00b68f7e3b Mon Sep 17 00:00:00 2001
From: Charlie Roche <charlie@middleware.se>
Date: Tue, 6 Apr 2021 16:02:54 +0200
Subject: [PATCH 3/3] Removed empty line

---
 .../java/com/redhat/examples/backend/BackendHttpServlet.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
index 7bb10b0..8fab3d8 100644
--- a/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
+++ b/backend/src/main/java/com/redhat/examples/backend/BackendHttpServlet.java
@@ -49,7 +49,6 @@ public class BackendHttpServlet extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
-
         //Place the HTTP headers in a Hashmap
         final HashMap<String, String> headers = new HashMap<String, String>();
         Enumeration<String> headerNames = req.getHeaderNames();