Skip to content

Commit 4d3802a

Browse files
authored
jetty9 http client: don't implement Response.CompleteListener (#11579)
1 parent 89b59cf commit 4d3802a

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyHttpClient9TracingInterceptor.java

+4-20
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import javax.annotation.Nullable;
1818
import org.eclipse.jetty.client.api.Request;
1919
import org.eclipse.jetty.client.api.Response;
20-
import org.eclipse.jetty.client.api.Result;
2120

2221
/**
2322
* JettyHttpClient9TracingInterceptor does three jobs stimulated from the Jetty Request object from
@@ -32,8 +31,7 @@ public final class JettyHttpClient9TracingInterceptor
3231
implements Request.BeginListener,
3332
Request.FailureListener,
3433
Response.SuccessListener,
35-
Response.FailureListener,
36-
Response.CompleteListener {
34+
Response.FailureListener {
3735

3836
private static final Logger logger =
3937
Logger.getLogger(JettyHttpClient9TracingInterceptor.class.getName());
@@ -88,7 +86,6 @@ public void attachToRequest(Request jettyRequest) {
8886
}
8987

9088
private void wrapRequestListeners(List<Request.RequestListener> requestListeners) {
91-
9289
ListIterator<Request.RequestListener> iterator = requestListeners.listIterator();
9390

9491
while (iterator.hasNext()) {
@@ -125,7 +122,6 @@ private void wrapRequestListeners(List<Request.RequestListener> requestListeners
125122
}
126123

127124
private void startSpan(Request request) {
128-
129125
if (!instrumenter.shouldStart(this.parentContext, request)) {
130126
return;
131127
}
@@ -135,14 +131,11 @@ private void startSpan(Request request) {
135131
@Override
136132
public void onBegin(Request request) {}
137133

138-
@Override
139-
public void onComplete(Result result) {
140-
closeIfPossible(result.getResponse());
141-
}
142-
143134
@Override
144135
public void onSuccess(Response response) {
145-
closeIfPossible(response);
136+
if (this.context != null) {
137+
instrumenter.end(this.context, response.getRequest(), response, null);
138+
}
146139
}
147140

148141
@Override
@@ -158,13 +151,4 @@ public void onFailure(Response response, Throwable t) {
158151
instrumenter.end(this.context, response.getRequest(), response, t);
159152
}
160153
}
161-
162-
private void closeIfPossible(Response response) {
163-
164-
if (this.context != null) {
165-
instrumenter.end(this.context, response.getRequest(), response, null);
166-
} else {
167-
logger.fine("onComplete - could not find an otel context");
168-
}
169-
}
170154
}

0 commit comments

Comments
 (0)