Skip to content

Include 5xx responses in default HTTP client error statuses #11156

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

Draft
saravadeo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Include 5xx responses in default HTTP client error statuses #11156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions ...t/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,8 @@ class HttpClientDecoratorTest extends ClientDecoratorTest {
399 | [status: 399] | false
400 | [status: 400] | true
499 | [status: 499] | true
500 | [status: 500] | false
500 | [status: 500] | false
500 | [status: 500] | false
500 | [status: 500] | true
599 | [status: 599] | true
600 | [status: 600] | false
null | [status: null] | false
null | null | false
Expand Down
2 changes: 1 addition & 1 deletion ...strumentation-testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
trace(size(2)) {
sortSpansByStart()
basicSpan(it, "parent")
clientSpan(it, span(0), method, false, false, uri, 500, false) // not an error.
clientSpan(it, span(0), method, false, false, uri, 500, true)
}
server.distributedRequestTrace(it, trace(0).last())
}
Expand Down
4 changes: 2 additions & 2 deletions ...ion/spring/spring-webflux/spring-webflux-5.0/src/bootTest/groovy/SpringWebfluxTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@ class SpringWebfluxTest extends InstrumentationSpecification {
sortSpansByStart()
def traceParent
trace(2) {
clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500)
traceParent = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500)
clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500, true)
traceParent = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500, true)
}
trace(2) {
span {
Expand Down
4 changes: 2 additions & 2 deletions ...ion/spring/spring-webflux/spring-webflux-6.0/src/bootTest/groovy/SpringWebfluxTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,8 @@ class SpringWebfluxHttp11Test extends InstrumentationSpecification {
sortSpansByStart()
def traceParent
trace(2) {
clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500)
traceParent = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500)
clientSpan(it, null, "http.request", "spring-webflux-client", "GET", URI.create(url), 500, true)
traceParent = clientSpan(it, span(0), "netty.client.request", "netty-client", "GET", URI.create(url), 500, true)
}
trace(2) {
span {
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public final class ConfigDefaults {
DEFAULT_HTTP_SERVER_ERROR_STATUSES = new BitSet();
DEFAULT_HTTP_SERVER_ERROR_STATUSES.set(500, 600);
DEFAULT_HTTP_CLIENT_ERROR_STATUSES = new BitSet();
DEFAULT_HTTP_CLIENT_ERROR_STATUSES.set(400, 500);
DEFAULT_HTTP_CLIENT_ERROR_STATUSES.set(400, 600);
DEFAULT_GRPC_SERVER_ERROR_STATUSES = new BitSet();
DEFAULT_GRPC_SERVER_ERROR_STATUSES.set(2, 17);
DEFAULT_GRPC_CLIENT_ERROR_STATUSES = new BitSet();
Expand Down
2 changes: 1 addition & 1 deletion internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class ConfigCollectorTest extends DDSpecification {
GeneralConfig.TELEMETRY_HEARTBEAT_INTERVAL | new Float(DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL).toString()
CiVisibilityConfig.CIVISIBILITY_GRADLE_SOURCE_SETS | "main,test"
IastConfig.IAST_WEAK_HASH_ALGORITHMS | DEFAULT_IAST_WEAK_HASH_ALGORITHMS.join(",")
TracerConfig.TRACE_HTTP_CLIENT_ERROR_STATUSES | "400-500"
TracerConfig.TRACE_HTTP_CLIENT_ERROR_STATUSES | "400-600"
}

def "default null config settings are also collected"() {
Expand Down
2 changes: 1 addition & 1 deletion internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ class ConfigTest extends DDSpecification {
config.requestHeaderTags == [:]
config.baggageMapping == [:]
config.httpServerErrorStatuses == toBitSet((500..599))
config.httpClientErrorStatuses == toBitSet((400..499))
config.httpClientErrorStatuses == toBitSet((400..599))
config.httpClientSplitByDomain == false
config.dbClientSplitByInstance == false
config.dbClientSplitByInstanceTypeSuffix == false
Expand Down
4 changes: 2 additions & 2 deletions metadata/supported-configurations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,7 +1613,7 @@
{
"version": "A",
"type": "string",
"default": "400-499",
"default": "400-600",
"aliases": []
}
],
Expand Down Expand Up @@ -6261,7 +6261,7 @@
{
"version": "A",
"type": "string",
"default": "400-499",
"default": "400-600",
"aliases": ["DD_HTTP_CLIENT_ERROR_STATUSES"]
}
],
Expand Down