Skip to content

Commit 17a0e59

Browse files
xhrgxhrg
committed
Fix Jetty client cannot receive the HTTP response body
1 parent 762d31f commit 17a0e59

File tree

8 files changed

+207
-13
lines changed

8 files changed

+207
-13
lines changed

‎CHANGES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Release Notes.
1616
* Update Maven to 3.6.3 in mvnw.
1717
* Fix OOM due to too many span logs.
1818
* Fix ClassLoader cache OOM issue with WeakHashMap.
19+
* Fix Jetty client cannot receive the HTTP response body.
1920

2021
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
2122

‎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‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
5858

5959
span.prepareForAsync();
6060
request.attribute(Constants.SW_JETTY_EXIT_SPAN_KEY, span);
61-
Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
62-
allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
61+
if (allArguments[0] instanceof Response.Listener) {
62+
Response.Listener callback = (Response.Listener) allArguments[0];
63+
allArguments[0] = new ResponseListenerWrapper(callback, ContextManager.capture());
64+
} else {
65+
Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
66+
allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
67+
}
6368
}
6469

6570
@Override

‎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‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
*/
18+
19+
package org.apache.skywalking.apm.plugin.jetty.v90.client;
20+
21+
import org.apache.skywalking.apm.agent.core.context.ContextManager;
22+
import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
23+
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
24+
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
25+
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
26+
import org.eclipse.jetty.client.api.Response;
27+
import org.eclipse.jetty.client.api.Result;
28+
import org.eclipse.jetty.http.HttpField;
29+
import java.nio.ByteBuffer;
30+
31+
public class ResponseListenerWrapper implements Response.Listener {
32+
33+
private final Response.Listener callback;
34+
35+
private final ContextSnapshot context;
36+
37+
public ResponseListenerWrapper(Response.Listener callback, ContextSnapshot context) {
38+
this.callback = callback;
39+
this.context = context;
40+
}
41+
42+
@Override
43+
public void onComplete(Result result) {
44+
AbstractSpan span = ContextManager.createLocalSpan(Constants.PLUGIN_NAME + "/CompleteListener/onComplete");
45+
span.setComponent(ComponentsDefine.JETTY_CLIENT);
46+
SpanLayer.asHttp(span);
47+
if (context != null) {
48+
ContextManager.continued(context);
49+
}
50+
if (callback != null) {
51+
callback.onComplete(result);
52+
}
53+
ContextManager.stopSpan();
54+
}
55+
56+
@Override
57+
public void onHeaders(Response response) {
58+
callback.onHeaders(response);
59+
}
60+
61+
@Override
62+
public void onContent(Response response, ByteBuffer content) {
63+
callback.onContent(response, content);
64+
}
65+
66+
@Override
67+
public void onBegin(Response response) {
68+
callback.onBegin(response);
69+
}
70+
71+
@Override
72+
public boolean onHeader(Response response, HttpField field) {
73+
return callback.onHeader(response, field);
74+
}
75+
76+
@Override
77+
public void onSuccess(Response response) {
78+
callback.onSuccess(response);
79+
}
80+
81+
@Override
82+
public void onFailure(Response response, Throwable failure) {
83+
callback.onFailure(response, failure);
84+
}
85+
}

‎apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/define/HttpRequestInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class HttpRequestInstrumentation extends ClassInstanceMethodsEnhancePlugi
4141
private static final String ENHANCE_CLASS = "org.eclipse.jetty.client.HttpRequest";
4242
private static final String ENHANCE_CLASS_NAME = "send";
4343
public static final String SYNC_SEND_INTERCEPTOR =
44-
"org.apache.skywalking.apm.plugin.jetty.v90.client.SyncHttpRequestSendV90Interceptor";
44+
"org.apache.skywalking.apm.plugin.jetty.v90.client.SyncHttpRequestSendInterceptor";
4545

4646
public static final String ASYNC_SEND_INTERCEPTOR =
4747
"org.apache.skywalking.apm.plugin.jetty.v90.client.AsyncHttpRequestSendInterceptor";

‎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‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
5757

5858
span.prepareForAsync();
5959
request.attribute(Constants.SW_JETTY_EXIT_SPAN_KEY, span);
60-
Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
61-
allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
60+
if (allArguments[0] instanceof Response.Listener) {
61+
Response.Listener callback = (Response.Listener) allArguments[0];
62+
allArguments[0] = new ResponseListenerWrapper(callback, ContextManager.capture());
63+
} else {
64+
Response.CompleteListener callback = (Response.CompleteListener) allArguments[0];
65+
allArguments[0] = new CompleteListenerWrapper(callback, ContextManager.capture());
66+
}
6267
}
6368

6469
@Override

‎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‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
*/
18+
19+
package org.apache.skywalking.apm.plugin.jetty.v9.client;
20+
21+
import org.apache.skywalking.apm.agent.core.context.ContextManager;
22+
import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
23+
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
24+
import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
25+
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
26+
import org.eclipse.jetty.client.api.Response;
27+
import org.eclipse.jetty.client.api.Result;
28+
import org.eclipse.jetty.http.HttpField;
29+
30+
import java.nio.ByteBuffer;
31+
32+
public class ResponseListenerWrapper implements Response.Listener {
33+
34+
private final Response.Listener callback;
35+
36+
private final ContextSnapshot context;
37+
38+
public ResponseListenerWrapper(Response.Listener callback, ContextSnapshot context) {
39+
this.callback = callback;
40+
this.context = context;
41+
}
42+
43+
@Override
44+
public void onComplete(Result result) {
45+
AbstractSpan span = ContextManager.createLocalSpan(Constants.PLUGIN_NAME + "/CompleteListener/onComplete");
46+
span.setComponent(ComponentsDefine.JETTY_CLIENT);
47+
SpanLayer.asHttp(span);
48+
if (context != null) {
49+
ContextManager.continued(context);
50+
}
51+
if (callback != null) {
52+
callback.onComplete(result);
53+
}
54+
ContextManager.stopSpan();
55+
}
56+
57+
@Override
58+
public void onHeaders(Response response) {
59+
callback.onHeaders(response);
60+
}
61+
62+
@Override
63+
public void onContent(Response response, ByteBuffer content) {
64+
callback.onContent(response, content);
65+
}
66+
67+
@Override
68+
public void onBegin(Response response) {
69+
callback.onBegin(response);
70+
}
71+
72+
@Override
73+
public boolean onHeader(Response response, HttpField field) {
74+
return callback.onHeader(response, field);
75+
}
76+
77+
@Override
78+
public void onSuccess(Response response) {
79+
callback.onSuccess(response);
80+
}
81+
82+
@Override
83+
public void onFailure(Response response, Throwable failure) {
84+
callback.onFailure(response, failure);
85+
}
86+
}

‎test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/controller/CaseController.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
*/
1818

19-
package org.apache.skywalking.apm.testcase.jettyclient.contr;
19+
package org.apache.skywalking.apm.testcase.jettyclient.controller;
2020

2121
import javax.annotation.PostConstruct;
2222
import java.io.IOException;
@@ -26,6 +26,8 @@
2626
import org.apache.http.impl.client.HttpClients;
2727
import org.eclipse.jetty.client.HttpClient;
2828
import org.eclipse.jetty.client.api.Response;
29+
import org.eclipse.jetty.client.api.Result;
30+
import org.eclipse.jetty.client.util.BufferingResponseListener;
2931
import org.springframework.beans.factory.annotation.Value;
3032
import org.springframework.context.annotation.PropertySource;
3133
import org.springframework.stereotype.Controller;
@@ -51,13 +53,19 @@ public void init() throws Exception {
5153
@ResponseBody
5254
public String jettyClientScenario() throws Exception {
5355
client.newRequest("http://" + jettyServerHost + ":18080/jettyserver-case/case/receiveContext-0").send();
54-
Response.CompleteListener listener = result -> {
55-
CloseableHttpClient httpclient = HttpClients.createDefault();
56-
HttpGet httpget = new HttpGet("http://" + jettyServerHost + ":18080/jettyserver-case/case/receiveContext-0");
57-
try {
58-
httpclient.execute(httpget);
59-
} catch (IOException e) {
60-
throw new RuntimeException(e);
56+
Response.Listener listener = new BufferingResponseListener() {
57+
public void onComplete(Result result) {
58+
byte[] bytes = this.getContent();
59+
if (bytes == null || bytes.length == 0) {
60+
throw new RuntimeException("content cant be empty");
61+
}
62+
CloseableHttpClient httpclient = HttpClients.createDefault();
63+
HttpGet httpget = new HttpGet("http://" + jettyServerHost + ":18080/jettyserver-case/case/receiveContext-0");
64+
try {
65+
httpclient.execute(httpget);
66+
} catch (IOException e) {
67+
throw new RuntimeException(e);
68+
}
6169
}
6270
};
6371
client.newRequest("http://" + jettyServerHost + ":18080/jettyserver-case/case/receiveContext-1").send(listener);

‎test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/servlet/CaseServlet.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.skywalking.apm.testcase.jettyserver.servlet;
2020

2121
import java.io.IOException;
22+
import java.io.PrintWriter;
2223
import javax.servlet.ServletException;
2324
import javax.servlet.http.HttpServlet;
2425
import javax.servlet.http.HttpServletRequest;
@@ -31,6 +32,9 @@ public class CaseServlet extends HttpServlet {
3132
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
3233
try {
3334
Thread.sleep(2000);
35+
resp.setContentType("text/plain;charset=UTF-8");
36+
PrintWriter out = resp.getWriter();
37+
out.print("Success");
3438
} catch (InterruptedException e) {
3539
}
3640
}

0 commit comments

Comments
 (0)