From 9681724e934b3fd45f5bd863c0566229c67dfe35 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 13 Jun 2024 12:26:51 +0300
Subject: [PATCH] jetty9 http client: don't implement Response.CompleteListener

---
 .../JettyHttpClient9TracingInterceptor.java   | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java
index b6b0b2ea0104..71c3e4778a60 100644
--- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java
+++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java
@@ -17,7 +17,6 @@
 import javax.annotation.Nullable;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
 
 /**
  * JettyHttpClient9TracingInterceptor does three jobs stimulated from the Jetty Request object from
@@ -32,8 +31,7 @@ public final class JettyHttpClient9TracingInterceptor
     implements Request.BeginListener,
         Request.FailureListener,
         Response.SuccessListener,
-        Response.FailureListener,
-        Response.CompleteListener {
+        Response.FailureListener {
 
   private static final Logger logger =
       Logger.getLogger(JettyHttpClient9TracingInterceptor.class.getName());
@@ -88,7 +86,6 @@ public void attachToRequest(Request jettyRequest) {
   }
 
   private void wrapRequestListeners(List<Request.RequestListener> requestListeners) {
-
     ListIterator<Request.RequestListener> iterator = requestListeners.listIterator();
 
     while (iterator.hasNext()) {
@@ -125,7 +122,6 @@ private void wrapRequestListeners(List<Request.RequestListener> requestListeners
   }
 
   private void startSpan(Request request) {
-
     if (!instrumenter.shouldStart(this.parentContext, request)) {
       return;
     }
@@ -135,14 +131,11 @@ private void startSpan(Request request) {
   @Override
   public void onBegin(Request request) {}
 
-  @Override
-  public void onComplete(Result result) {
-    closeIfPossible(result.getResponse());
-  }
-
   @Override
   public void onSuccess(Response response) {
-    closeIfPossible(response);
+    if (this.context != null) {
+      instrumenter.end(this.context, response.getRequest(), response, null);
+    }
   }
 
   @Override
@@ -158,13 +151,4 @@ public void onFailure(Response response, Throwable t) {
       instrumenter.end(this.context, response.getRequest(), response, t);
     }
   }
-
-  private void closeIfPossible(Response response) {
-
-    if (this.context != null) {
-      instrumenter.end(this.context, response.getRequest(), response, null);
-    } else {
-      logger.fine("onComplete - could not find an otel context");
-    }
-  }
 }