Skip to content

Fix error mark on http status for IBM liberty #8822

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
May 16, 2025
Merged

Fix error mark on http status for IBM liberty #8822

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
6d1ea94
Fix error mark on http status for IBM liberty
amarziali May 14, 2025
e2f2c9a
leave tests as forked
amarziali May 14, 2025
3b7aba2
Merge branch 'master' into andrea.marziali/liberty-fix
amarziali May 16, 2025
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
2 changes: 1 addition & 1 deletion ...on/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
// we may have the status during response blocking, but in that case
// the status code is not propagated to the servlet layer
if (currentStatus == null || !span.isError()) {
span.setHttpStatusCode(status);
super.onResponseStatus(span, status);
}
return span;
}
Expand Down
9 changes: 0 additions & 9 deletions ...n/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,6 @@ abstract class Liberty20Test extends HttpServerTest<Server> {
true
}

@Override
String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
if (endpoint.path == '/not-found') {
'GET /testapp/not-found'
} else {
super.expectedResourceName(endpoint, method, address)
}
}

def 'test blocking on response with commit during the response'() {
setup:
assumeTrue(testBlockingOnResponse())
Expand Down
2 changes: 1 addition & 1 deletion ...on/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
// we may have the status during response blocking, but in that case
// the status code is not propagated to the servlet layer
if (currentStatus == null || !span.isError()) {
span.setHttpStatusCode(status);
super.onResponseStatus(span, status);
}
return span;
}
Expand Down
9 changes: 0 additions & 9 deletions ...n/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,6 @@ abstract class Liberty23Test extends HttpServerTest<Server> {
true
}

@Override
String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
if (endpoint.path == '/not-found') {
'GET /testapp/not-found'
} else {
super.expectedResourceName(endpoint, method, address)
}
}

def 'test blocking on response with commit during the response'() {
setup:
assumeTrue(testBlockingOnResponse())
Expand Down
Loading