Add compatibility for the AsyncContentListener interface and modify callback names

xhrg · xhrg · commit edaa3af91a19 · 2025-09-25T17:10:54.000+08:00
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/AsyncHttpRequestSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/AsyncHttpRequestSendInterceptor.java
@@ -59,11 +59,11 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
         span.prepareForAsync();
         request.attribute(Constants.SW_JETTY_EXIT_SPAN_KEY, span);
         if (allArguments[0] instanceof Response.Listener) {
-            Response.Listener callback = (Response.Listener) allArguments[0];
-            allArguments[0] = new ResponseListenerWrapper(callback, ContextManager.capture());
+            Response.Listener listener = (Response.Listener) allArguments[0];
+            allArguments[0] = new ResponseListenerWrapper(listener, ContextManager.capture());
         } else {
-            Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
-            allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
+            Response.CompleteListener listener = (Response.CompleteListener) allArguments[0];
+            allArguments[0] = new CompleteListenerWrapper(listener, ContextManager.capture());
         }
     }
 
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/CompleteListenerWrapper.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/CompleteListenerWrapper.java
@@ -27,11 +27,11 @@
 import org.eclipse.jetty.client.api.Result;
 
 public class CompleteListenerWrapper implements Response.CompleteListener  {
-    private Response.CompleteListener callback;
+    private Response.CompleteListener listener;
     private ContextSnapshot context;
 
-    public CompleteListenerWrapper(Response.CompleteListener callback, ContextSnapshot context) {
-        this.callback = callback;
+    public CompleteListenerWrapper(Response.CompleteListener listener, ContextSnapshot context) {
+        this.listener = listener;
         this.context = context;
     }
 
@@ -43,9 +43,9 @@ public void onComplete(Result result) {
         if (context != null) {
             ContextManager.continued(context);
         }
-        if (callback != null) {
-            callback.onComplete(result);
+        if (listener != null) {
+            listener.onComplete(result);
         }
         ContextManager.stopSpan();
     }
-}
+}
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/ResponseListenerWrapper.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/ResponseListenerWrapper.java
@@ -30,12 +30,12 @@
 
 public class ResponseListenerWrapper implements Response.Listener {
 
-    private final Response.Listener callback;
+    private final Response.Listener listener;
 
     private final ContextSnapshot context;
 
-    public ResponseListenerWrapper(Response.Listener callback, ContextSnapshot context) {
-        this.callback = callback;
+    public ResponseListenerWrapper(Response.Listener listener, ContextSnapshot context) {
+        this.listener = listener;
         this.context = context;
     }
 
@@ -47,39 +47,39 @@ public void onComplete(Result result) {
         if (context != null) {
             ContextManager.continued(context);
         }
-        if (callback != null) {
-            callback.onComplete(result);
+        if (listener != null) {
+            listener.onComplete(result);
         }
         ContextManager.stopSpan();
     }
 
     @Override
     public void onHeaders(Response response) {
-        callback.onHeaders(response);
+        listener.onHeaders(response);
     }
 
     @Override
     public void onContent(Response response, ByteBuffer content) {
-        callback.onContent(response, content);
+        listener.onContent(response, content);
     }
 
     @Override
     public void onBegin(Response response) {
-        callback.onBegin(response);
+        listener.onBegin(response);
     }
 
     @Override
     public boolean onHeader(Response response, HttpField field) {
-        return callback.onHeader(response, field);
+        return listener.onHeader(response, field);
     }
 
     @Override
     public void onSuccess(Response response) {
-        callback.onSuccess(response);
+        listener.onSuccess(response);
     }
 
     @Override
     public void onFailure(Response response, Throwable failure) {
-        callback.onFailure(response, failure);
+        listener.onFailure(response, failure);
     }
 }
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
@@ -31,7 +31,7 @@
     <url>http://maven.apache.org</url>
 
     <properties>
-        <jetty-client.version>9.1.0.v20131115</jetty-client.version>
+        <jetty-client.version>9.2.23.v20171218</jetty-client.version>
     </properties>
 
     <dependencies>
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/AsyncHttpRequestSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/AsyncHttpRequestSendInterceptor.java
@@ -58,11 +58,11 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
         span.prepareForAsync();
         request.attribute(Constants.SW_JETTY_EXIT_SPAN_KEY, span);
         if (allArguments[0] instanceof Response.Listener) {
-            Response.Listener callback = (Response.Listener) allArguments[0];
-            allArguments[0] = new ResponseListenerWrapper(callback, ContextManager.capture());
+            Response.Listener listener = (Response.Listener) allArguments[0];
+            allArguments[0] = new ResponseListenerWrapper(listener, ContextManager.capture());
         } else {
-            Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
-            allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
+            Response.CompleteListener listener = (Response.CompleteListener) allArguments[0];
+            allArguments[0] = new CompleteListenerWrapper(listener, ContextManager.capture());
         }
     }
 
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/CompleteListenerWrapper.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/CompleteListenerWrapper.java
@@ -27,11 +27,11 @@
 import org.eclipse.jetty.client.api.Result;
 
 public class CompleteListenerWrapper implements Response.CompleteListener  {
-    private Response.CompleteListener callback;
+    private Response.CompleteListener listener;
     private ContextSnapshot context;
 
-    public CompleteListenerWrapper(Response.CompleteListener callback, ContextSnapshot context) {
-        this.callback = callback;
+    public CompleteListenerWrapper(Response.CompleteListener listener, ContextSnapshot context) {
+        this.listener = listener;
         this.context = context;
     }
 
@@ -43,9 +43,9 @@ public void onComplete(Result result) {
         if (context != null) {
             ContextManager.continued(context);
         }
-        if (callback != null) {
-            callback.onComplete(result);
+        if (listener != null) {
+            listener.onComplete(result);
         }
         ContextManager.stopSpan();
     }
-}
+}
diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/ResponseListenerWrapper.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/ResponseListenerWrapper.java
@@ -26,17 +26,18 @@
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.api.Result;
 import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.util.Callback;
 
 import java.nio.ByteBuffer;
 
 public class ResponseListenerWrapper implements Response.Listener {
 
-    private final Response.Listener callback;
+    private final Response.Listener listener;
 
     private final ContextSnapshot context;
 
-    public ResponseListenerWrapper(Response.Listener callback, ContextSnapshot context) {
-        this.callback = callback;
+    public ResponseListenerWrapper(Response.Listener listener, ContextSnapshot context) {
+        this.listener = listener;
         this.context = context;
     }
 
@@ -48,39 +49,44 @@ public void onComplete(Result result) {
         if (context != null) {
             ContextManager.continued(context);
         }
-        if (callback != null) {
-            callback.onComplete(result);
+        if (listener != null) {
+            listener.onComplete(result);
         }
         ContextManager.stopSpan();
     }
 
     @Override
     public void onHeaders(Response response) {
-        callback.onHeaders(response);
+        listener.onHeaders(response);
+    }
+
+    @Override
+    public void onContent(Response response, ByteBuffer content, Callback callback) {
+        listener.onContent(response, content, callback);
     }
 
     @Override
     public void onContent(Response response, ByteBuffer content) {
-        callback.onContent(response, content);
+        listener.onContent(response, content);
     }
 
     @Override
     public void onBegin(Response response) {
-        callback.onBegin(response);
+        listener.onBegin(response);
     }
 
     @Override
     public boolean onHeader(Response response, HttpField field) {
-        return callback.onHeader(response, field);
+        return listener.onHeader(response, field);
     }
 
     @Override
     public void onSuccess(Response response) {
-        callback.onSuccess(response);
+        listener.onSuccess(response);
     }
 
     @Override
     public void onFailure(Response response, Throwable failure) {
-        callback.onFailure(response, failure);
+        listener.onFailure(response, failure);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@`
`27`	`27`	`import org.eclipse.jetty.client.api.Result;`
`28`	`28`
`29`	`29`	`public class CompleteListenerWrapper implements Response.CompleteListener {`
`30`		`- private Response.CompleteListener callback;`
	`30`	`+ private Response.CompleteListener listener;`
`31`	`31`	`private ContextSnapshot context;`
`32`	`32`
`33`		`- public CompleteListenerWrapper(Response.CompleteListener callback, ContextSnapshot context) {`
`34`		`- this.callback = callback;`
	`33`	`+ public CompleteListenerWrapper(Response.CompleteListener listener, ContextSnapshot context) {`
	`34`	`+ this.listener = listener;`
`35`	`35`	`this.context = context;`
`36`	`36`	`}`
`37`	`37`
`@@ -43,9 +43,9 @@ public void onComplete(Result result) {`
`43`	`43`	`if (context != null) {`
`44`	`44`	`ContextManager.continued(context);`
`45`	`45`	`}`
`46`		`- if (callback != null) {`
`47`		`- callback.onComplete(result);`
	`46`	`+ if (listener != null) {`
	`47`	`+ listener.onComplete(result);`
`48`	`48`	`}`
`49`	`49`	`ContextManager.stopSpan();`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@`
`30`	`30`
`31`	`31`	`public class ResponseListenerWrapper implements Response.Listener {`
`32`	`32`
`33`		`- private final Response.Listener callback;`
	`33`	`+ private final Response.Listener listener;`
`34`	`34`
`35`	`35`	`private final ContextSnapshot context;`
`36`	`36`
`37`		`- public ResponseListenerWrapper(Response.Listener callback, ContextSnapshot context) {`
`38`		`- this.callback = callback;`
	`37`	`+ public ResponseListenerWrapper(Response.Listener listener, ContextSnapshot context) {`
	`38`	`+ this.listener = listener;`
`39`	`39`	`this.context = context;`
`40`	`40`	`}`
`41`	`41`
`@@ -47,39 +47,39 @@ public void onComplete(Result result) {`
`47`	`47`	`if (context != null) {`
`48`	`48`	`ContextManager.continued(context);`
`49`	`49`	`}`
`50`		`- if (callback != null) {`
`51`		`- callback.onComplete(result);`
	`50`	`+ if (listener != null) {`
	`51`	`+ listener.onComplete(result);`
`52`	`52`	`}`
`53`	`53`	`ContextManager.stopSpan();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`public void onHeaders(Response response) {`
`58`		`- callback.onHeaders(response);`
	`58`	`+ listener.onHeaders(response);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`	`62`	`public void onContent(Response response, ByteBuffer content) {`
`63`		`- callback.onContent(response, content);`
	`63`	`+ listener.onContent(response, content);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public void onBegin(Response response) {`
`68`		`- callback.onBegin(response);`
	`68`	`+ listener.onBegin(response);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`	`72`	`public boolean onHeader(Response response, HttpField field) {`
`73`		`- return callback.onHeader(response, field);`
	`73`	`+ return listener.onHeader(response, field);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`public void onSuccess(Response response) {`
`78`		`- callback.onSuccess(response);`
	`78`	`+ listener.onSuccess(response);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public void onFailure(Response response, Throwable failure) {`
`83`		`- callback.onFailure(response, failure);`
	`83`	`+ listener.onFailure(response, failure);`
`84`	`84`	`}`
`85`	`85`	`}`