Skip to content

Fix netty connection keep alive #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2023
Merged

Fix netty connection keep alive #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a05d2f5
fix netty connection keep alive context
shashank11p Jun 13, 2023
c2f6ae2
format
shashank11p Jun 13, 2023
748274b
added comment
shashank11p Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...aagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
span.setStatus(code >= 100 && code < 500 ? StatusCode.UNSET : StatusCode.ERROR);
}
if (msg instanceof LastHttpContent) {
// When we end the span, we should set the server context and request attr to null so that
// for the next request a new context and request is made and stored in channel.
// Else, when using a Connection: keep-alive header, the same server context and request attr
// is used in the subsequent requests.
ctx.channel()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds like this could use some comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

.attr(io.opentelemetry.instrumentation.netty.v4_1.internal.AttributeKeys.SERVER_CONTEXT)
.set(null);
ctx.channel().attr(AttributeKeys.REQUEST).set(null);
span.end();
}
}
Expand Down
92 changes: 92 additions & 0 deletions ...nstrumentation/hypertrace/netty/v4_1/server/AbstractNetty41ServerInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,96 @@ public void blocking() throws IOException, TimeoutException, InterruptedExceptio
.getAttributes()
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_BODY)));
}

@Test
public void connectionKeepAlive() throws IOException, TimeoutException, InterruptedException {
Request request =
new Request.Builder()
.url(String.format("http://localhost:%d/post", port))
.header(REQUEST_HEADER_NAME, REQUEST_HEADER_VALUE)
.header("first", "1st")
.header("connection", "keep-alive")
.get()
.build();

try (Response response = httpClient.newCall(request).execute()) {
Assertions.assertEquals(200, response.code());
Assertions.assertEquals(RESPONSE_BODY, response.body().string());
}

List<List<SpanData>> traces = TEST_WRITER.getTraces();
TEST_WRITER.waitForTraces(1);
Assertions.assertEquals(1, traces.size());
List<SpanData> trace = traces.get(0);
Assertions.assertEquals(1, trace.size());
SpanData spanData = trace.get(0);

Assertions.assertEquals(
REQUEST_HEADER_VALUE,
spanData
.getAttributes()
.get(HypertraceSemanticAttributes.httpRequestHeader(REQUEST_HEADER_NAME)));
Assertions.assertEquals(
"1st",
spanData.getAttributes().get(HypertraceSemanticAttributes.httpRequestHeader("first")));
Assertions.assertEquals(
"keep-alive",
spanData.getAttributes().get(HypertraceSemanticAttributes.httpRequestHeader("connection")));
Assertions.assertEquals(
RESPONSE_HEADER_VALUE,
spanData
.getAttributes()
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_HEADER_NAME)));
Assertions.assertNull(
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
Assertions.assertEquals(
RESPONSE_BODY,
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));

RequestBody requestBody = blockedRequestBody(true, 3000, 75);
Request request2 =
new Request.Builder()
.url(String.format("http://localhost:%d/post", port))
.header(REQUEST_HEADER_NAME, "REQUEST_HEADER_VALUE")
.header("second", "2nd")
.header("connection", "keep-alive")
.post(requestBody)
.build();

try (Response response = httpClient.newCall(request2).execute()) {
Assertions.assertEquals(403, response.code());
Assertions.assertTrue(response.body().string().isEmpty());
}

List<List<SpanData>> traces2 = TEST_WRITER.getTraces();
TEST_WRITER.waitForTraces(2);
Assertions.assertEquals(2, traces2.size());
List<SpanData> trace2 = traces2.get(1);
Assertions.assertEquals(1, trace2.size());
SpanData spanData2 = trace2.get(0);

Assertions.assertEquals(
"REQUEST_HEADER_VALUE",
spanData2
.getAttributes()
.get(HypertraceSemanticAttributes.httpRequestHeader(REQUEST_HEADER_NAME)));
Assertions.assertEquals(
"2nd",
spanData2.getAttributes().get(HypertraceSemanticAttributes.httpRequestHeader("second")));
Assertions.assertEquals(
"keep-alive",
spanData2
.getAttributes()
.get(HypertraceSemanticAttributes.httpRequestHeader("connection")));
Assertions.assertNull(
spanData2.getAttributes().get(HypertraceSemanticAttributes.httpRequestHeader("first")));
Assertions.assertNull(
spanData2
.getAttributes()
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_HEADER_NAME)));
Assertions.assertNull(
spanData2
.getAttributes()
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_BODY)));
}
}