Skip to content

Disable service discovery in CI Visibility agentless mode #12908

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

Open
daniel-mohedano wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable service discovery in CI Visibility agentless mode #12908

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
4 changes: 3 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3283,7 +3283,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
TRACE_LONG_RUNNING_FLUSH_INTERVAL, DEFAULT_TRACE_LONG_RUNNING_FLUSH_INTERVAL);
serviceDiscoveryEnabled =
configProvider.getBoolean(
TRACE_SERVICE_DISCOVERY_ENABLED, DEFAULT_SERVICE_DISCOVERY_ENABLED);
TRACE_SERVICE_DISCOVERY_ENABLED,
DEFAULT_SERVICE_DISCOVERY_ENABLED
&& !(isCiVisibilityEnabled() && ciVisibilityAgentlessEnabled));

if (longRunningEnabled
&& (longRunningTraceInitialFlushInterval < 10
Expand Down
29 changes: 29 additions & 0 deletions internal-api/src/test/java/datadog/trace/api/ConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLE_RATE;
import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_OPERATION_RULES;
import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_SERVICE_RULES;
import static datadog.trace.api.config.TracerConfig.TRACE_SERVICE_DISCOVERY_ENABLED;
import static datadog.trace.api.config.TracerConfig.TRACE_X_DATADOG_TAGS_MAX_LENGTH;
import static datadog.trace.api.config.TracerConfig.WRITER_TYPE;
import static datadog.trace.api.env.FixedCapturedEnvironment.useFixedEnv;
Expand Down Expand Up @@ -3115,6 +3116,34 @@ void configInstantiationShouldNotFailIfCiVisibilityAgentlessModeIsEnabledAndApiK
assertTrue(config.isCiVisibilityAgentlessEnabled());
}

@TableTest({
"scenario | ciVisibility | agentless | serviceDiscovery | expected",
"default | false | false | | true ",
"CI Visibility with agent | true | false | | true ",
"CI Visibility agentless | true | true | | false ",
"explicitly enabled override | true | true | true | true "
})
@ParameterizedTest(name = "[{index}] {0}")
void serviceDiscoveryIsDisabledInCiVisibilityAgentlessMode(
String scenario,
boolean ciVisibility,
boolean agentless,
String serviceDiscovery,
boolean expected)
throws Exception {
Properties properties = new Properties();
properties.setProperty(CIVISIBILITY_ENABLED, String.valueOf(ciVisibility));
properties.setProperty(CIVISIBILITY_AGENTLESS_ENABLED, String.valueOf(agentless));
properties.setProperty(API_KEY, "123456789");
if (serviceDiscovery != null) {
properties.setProperty(TRACE_SERVICE_DISCOVERY_ENABLED, serviceDiscovery);
}

Config config = newConfig(withPropertiesOverride(properties));

assertEquals(expected, config.isServiceDiscoveryEnabled());
}

@TableTest({
"scenario | configuredBuckets | expectedBuckets",
"'5,4,3,2,1' | '5,4,3,2,1' | [5, 4, 3, 2, 1]",
Expand Down
Loading