Skip to content

Pin v1 protocol to test system-tests. #11573

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
AlexeyKuznetsov-DD wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Pin v1 protocol to test system-tests. #11573

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
02155e1
Pin `v1` protocol to test system-tests.
AlexeyKuznetsov-DD Jun 4, 2026
48654c7
Fixed test for `v1` endpoint.
AlexeyKuznetsov-DD Jun 4, 2026
f2cea8f
Merge branch 'master' into alexeyk/test-v1-system-tests
AlexeyKuznetsov-DD Jun 5, 2026
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
4 changes: 2 additions & 2 deletions communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static datadog.communication.http.OkHttpUtils.msgpackRequestBodyOf;
import static datadog.communication.http.OkHttpUtils.prepareRequest;
import static datadog.communication.serialization.msgpack.MsgPackWriter.FIXARRAY;
import static datadog.trace.api.ProtocolVersion.V0_4;
import static datadog.trace.api.ProtocolVersion.V1_0;
import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static java.util.Collections.singletonList;
Expand Down Expand Up @@ -118,7 +118,7 @@ public DDAgentFeaturesDiscovery(
this.agentBaseUrl = agentUrl;
this.metricsEnabled = metricsEnabled;
this.ignoreAgentVersionForStats = ignoreAgentVersionForStats;
this.protocolVersion = protocolVersion != null ? protocolVersion : V0_4;
this.protocolVersion = protocolVersion != null ? protocolVersion : V1_0;
this.discoveryTimer = monitoring.newTimer("trace.agent.discovery.time");
this.discoveryState = new State();
}
Expand Down
7 changes: 4 additions & 3 deletions ...ication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
V1_0 | V1_ENDPOINT
}

def "null protocol version falls back to v0.4 trace endpoints"() {
def "null protocol version falls back to v1.0 trace endpoints"() {
setup:
OkHttpClient client = Mock(OkHttpClient)
DDAgentFeaturesDiscovery features =
Expand All @@ -99,9 +99,10 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {

then:
1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, "{}") }
1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v1.0/traces" }) >> { Request request -> success(request) }
0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.5/traces" }) >> { Request request -> success(request) }
1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
features.getTraceEndpoint() == V04_ENDPOINT
0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
features.getTraceEndpoint() == V1_ENDPOINT
0 * _
}

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 @@ -88,7 +88,7 @@ public final class ConfigDefaults {
Arrays.asList("user.id", "session.id", "account.id");
static final boolean DEFAULT_JMX_FETCH_ENABLED = true;

static final String DEFAULT_TRACE_AGENT_PROTOCOL_VERSION = ProtocolVersion.V0_4.asConfigValue();
static final String DEFAULT_TRACE_AGENT_PROTOCOL_VERSION = ProtocolVersion.V1_0.asConfigValue();

static final boolean DEFAULT_CLIENT_IP_ENABLED = false;

Expand Down
Loading