Skip to content

Commit 6e03d19

Browse files
PerfectSlayerPerfectSlayer
authored
feat(config): Refactoring config into its own module (#9426)
Using `utils` for now as it has `:dd-trace-api` as dependency so can't be considered as a `:component`.
1 parent d9f68ed commit 6e03d19

File tree

50 files changed

+282
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+282
-211
lines changed

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_STARTUP;
1515
import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACE_STARTUP;
1616
import static datadog.trace.util.AgentThreadFactory.newAgentThread;
17-
import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
18-
import static datadog.trace.util.Strings.toEnvVar;
17+
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName;
18+
import static datadog.trace.util.ConfigStrings.toEnvVar;
1919

2020
import datadog.environment.EnvironmentVariables;
2121
import datadog.environment.JavaVirtualMachine;

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import datadog.trace.api.Config
44
import datadog.trace.api.civisibility.config.TestFQN
55
import datadog.trace.api.config.CiVisibilityConfig
66
import datadog.trace.api.config.GeneralConfig
7-
import datadog.trace.util.Strings
87
import spock.lang.Specification
98
import spock.util.environment.Jvm
109

10+
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName
11+
1112
abstract class CiVisibilitySmokeTest extends Specification {
1213
static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']"]
1314

@@ -73,7 +74,7 @@ abstract class CiVisibilitySmokeTest extends Specification {
7374
argMap.put(CiVisibilityConfig.CIVISIBILITY_DEBUG_PORT, "5055")
7475
}
7576

76-
String agentArgs = argMap.collect { k, v -> "${Strings.propertyNameToSystemPropertyName(k)}=${v}" }.join(",")
77+
String agentArgs = argMap.collect { k, v -> "${propertyNameToSystemPropertyName(k)}=${v}" }.join(",")
7778
arguments += "-javaagent:${AGENT_JAR}=${agentArgs}".toString()
7879

7980
return arguments

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST;
44
import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT;
55
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
6-
import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
6+
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName;
77

88
import datadog.environment.SystemProperties;
99
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datadog.trace.civisibility.domain.buildsystem;
22

33
import static datadog.context.propagation.Propagators.defaultPropagator;
4+
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName;
45

56
import datadog.communication.ddagent.TracerVersion;
67
import datadog.context.propagation.CarrierSetter;
@@ -31,7 +32,6 @@
3132
import datadog.trace.civisibility.ipc.SignalType;
3233
import datadog.trace.civisibility.source.LinesResolver;
3334
import datadog.trace.civisibility.source.SourcePathResolver;
34-
import datadog.trace.util.Strings;
3535
import java.net.InetSocketAddress;
3636
import java.nio.file.Path;
3737
import java.util.Collection;
@@ -148,81 +148,72 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
148148
}
149149

150150
propagatedSystemProperties.put(
151-
Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED),
151+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED),
152152
Boolean.toString(executionSettings.isItrEnabled()));
153153

154154
propagatedSystemProperties.put(
155-
Strings.propertyNameToSystemPropertyName(
156-
CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_ENABLED),
155+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_ENABLED),
157156
Boolean.toString(executionSettings.isCodeCoverageEnabled()));
158157

159158
propagatedSystemProperties.put(
160-
Strings.propertyNameToSystemPropertyName(
161-
CiVisibilityConfig.CIVISIBILITY_TEST_SKIPPING_ENABLED),
159+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_SKIPPING_ENABLED),
162160
Boolean.toString(executionSettings.isTestSkippingEnabled()));
163161

164162
propagatedSystemProperties.put(
165-
Strings.propertyNameToSystemPropertyName(
166-
CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ENABLED),
163+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ENABLED),
167164
Boolean.toString(executionSettings.isFlakyTestRetriesEnabled()));
168165

169166
propagatedSystemProperties.put(
170-
Strings.propertyNameToSystemPropertyName(
167+
propertyNameToSystemPropertyName(
171168
CiVisibilityConfig.CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED),
172169
Boolean.toString(executionSettings.isImpactedTestsDetectionEnabled()));
173170

174171
propagatedSystemProperties.put(
175-
Strings.propertyNameToSystemPropertyName(
172+
propertyNameToSystemPropertyName(
176173
CiVisibilityConfig.CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED),
177174
Boolean.toString(executionSettings.getEarlyFlakeDetectionSettings().isEnabled()));
178175

179176
propagatedSystemProperties.put(
180-
Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED),
177+
propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED),
181178
Boolean.toString(executionSettings.getTestManagementSettings().isEnabled()));
182179

183180
propagatedSystemProperties.put(
184-
Strings.propertyNameToSystemPropertyName(
185-
CiVisibilityConfig.TEST_FAILED_TEST_REPLAY_ENABLED),
181+
propertyNameToSystemPropertyName(CiVisibilityConfig.TEST_FAILED_TEST_REPLAY_ENABLED),
186182
Boolean.toString(executionSettings.isFailedTestReplayEnabled()));
187183

188184
// explicitly disable build instrumentation in child processes,
189185
// because some projects run "embedded" Maven/Gradle builds as part of their integration tests,
190186
// and we don't want to show those as if they were regular build executions
191187
propagatedSystemProperties.put(
192-
Strings.propertyNameToSystemPropertyName(
188+
propertyNameToSystemPropertyName(
193189
CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED),
194190
Boolean.toString(false));
195191

196192
propagatedSystemProperties.put(
197-
Strings.propertyNameToSystemPropertyName(
198-
CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
193+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
199194
TracerVersion.TRACER_VERSION);
200195

201196
propagatedSystemProperties.put(
202-
Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
197+
propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
203198
propagatedSystemProperties.put(
204-
Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
199+
propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
205200
String.valueOf(userProvidedServiceName));
206201
propagatedSystemProperties.put(
207-
Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME),
208-
moduleName);
202+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME), moduleName);
209203
propagatedSystemProperties.put(
210-
Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND),
204+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND),
211205
startCommand);
212206

213207
propagatedSystemProperties.put(
214-
Strings.propertyNameToSystemPropertyName(
215-
CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST),
208+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST),
216209
signalServerAddress != null ? signalServerAddress.getHostName() : null);
217210
propagatedSystemProperties.put(
218-
Strings.propertyNameToSystemPropertyName(
219-
CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT),
211+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT),
220212
String.valueOf(signalServerAddress != null ? signalServerAddress.getPort() : 0));
221213

222214
List<String> coverageIncludedPackages = sessionSettings.getCoverageIncludedPackages();
223215
propagatedSystemProperties.put(
224-
Strings.propertyNameToSystemPropertyName(
225-
CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_INCLUDES),
216+
propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_INCLUDES),
226217
String.join(":", coverageIncludedPackages));
227218

228219
if (jacocoAgent != null && !config.isCiVisibilityCoverageLinesDisabled()) {
@@ -234,7 +225,7 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
234225
// This setting is only relevant if per-test code coverage is enabled,
235226
// otherwise it has no effect.
236227
propagatedSystemProperties.put(
237-
Strings.propertyNameToSystemPropertyName(
228+
propertyNameToSystemPropertyName(
238229
CiVisibilityConfig.CIVISIBILITY_CODE_COVERAGE_LINES_ENABLED),
239230
Boolean.toString(true));
240231
}

‎dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CITagsProviderTest.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import datadog.trace.civisibility.ci.env.CiEnvironmentImpl
88
import datadog.trace.civisibility.git.CILocalGitInfoBuilder
99
import datadog.trace.civisibility.git.CIProviderGitInfoBuilder
1010
import datadog.trace.civisibility.git.tree.GitClient
11-
import datadog.trace.util.Strings
1211
import org.junit.Rule
1312
import org.junit.contrib.java.lang.system.EnvironmentVariables
1413
import org.junit.contrib.java.lang.system.RestoreSystemProperties
@@ -17,6 +16,8 @@ import spock.lang.Specification
1716
import java.nio.file.Path
1817
import java.nio.file.Paths
1918

19+
import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName
20+
2021
abstract class CITagsProviderTest extends Specification {
2122

2223
static final CI_WORKSPACE_PATH_FOR_TESTS = "ci/ci_workspace_for_tests"
@@ -70,7 +71,7 @@ abstract class CITagsProviderTest extends Specification {
7071
environmentVariables.set(it.key, it.value)
7172
}
7273

73-
environmentVariables.set(Strings.propertyNameToEnvironmentVariableName(UserSuppliedGitInfoBuilder.DD_GIT_COMMIT_SHA), "1234567890123456789012345678901234567890")
74+
environmentVariables.set(propertyNameToEnvironmentVariableName(UserSuppliedGitInfoBuilder.DD_GIT_COMMIT_SHA), "1234567890123456789012345678901234567890")
7475

7576
when:
7677
CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(Config.get(), GIT_FOLDER_FOR_TESTS, new CiEnvironmentImpl(System.getenv()))
@@ -89,7 +90,7 @@ abstract class CITagsProviderTest extends Specification {
8990
environmentVariables.set(it.key, it.value)
9091
}
9192

92-
environmentVariables.set(Strings.propertyNameToEnvironmentVariableName(UserSuppliedGitInfoBuilder.DD_GIT_REPOSITORY_URL), "local supplied repo url")
93+
environmentVariables.set(propertyNameToEnvironmentVariableName(UserSuppliedGitInfoBuilder.DD_GIT_REPOSITORY_URL), "local supplied repo url")
9394

9495
when:
9596
CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(Config.get(), GIT_FOLDER_FOR_TESTS, new CiEnvironmentImpl(System.getenv()))

‎dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import datadog.trace.core.PendingTrace
5050
import datadog.trace.core.datastreams.DefaultDataStreamsMonitoring
5151
import datadog.trace.test.util.DDSpecification
5252
import datadog.trace.util.AgentTaskScheduler
53-
import datadog.trace.util.Strings
53+
import datadog.trace.util.ConfigStrings
5454
import de.thetaphi.forbiddenapis.SuppressForbidden
5555
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
5656
import groovy.transform.stc.ClosureParams
@@ -117,7 +117,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
117117
StringBuilder ddEnvVars = new StringBuilder()
118118
for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
119119
if (entry.getKey().toString().startsWith("dd.")) {
120-
ddEnvVars.append(Strings.systemPropertyNameToEnvironmentVariableName(entry.getKey().toString()))
120+
ddEnvVars.append(ConfigStrings.systemPropertyNameToEnvironmentVariableName(entry.getKey().toString()))
121121
.append("=").append(entry.getValue()).append(",")
122122
}
123123
}

‎dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
100100
+ "datadog.trace.api.ResolverCacheConfig$5:build_time,"
101101
+ "datadog.trace.api.TracePropagationStyle:build_time,"
102102
+ "datadog.trace.api.TracePropagationBehaviorExtract:build_time,"
103-
+ "datadog.trace.api.telemetry.OtelEnvMetricCollector:build_time,"
103+
+ "datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl:build_time,"
104104
+ "datadog.trace.api.profiling.ProfilingEnablement:build_time,"
105105
+ "datadog.trace.bootstrap.config.provider.ConfigConverter:build_time,"
106106
+ "datadog.trace.bootstrap.config.provider.ConfigConverter$ValueOfLookup:build_time,"

‎dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import datadog.trace.api.Config
44
import datadog.trace.api.civisibility.domain.BuildSessionSettings
55
import datadog.trace.api.config.CiVisibilityConfig
66
import datadog.trace.bootstrap.DatadogClassLoader
7+
import datadog.trace.util.ConfigStrings
78
import datadog.trace.util.Strings
89
import org.gradle.api.Project
910
import org.gradle.api.Task
@@ -73,7 +74,7 @@ class GradleProjectConfigurator {
7374
}
7475

7576
String taskPath = task.getPath()
76-
jvmArgs.add("-D" + Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME) + '=' + taskPath)
77+
jvmArgs.add("-D" + ConfigStrings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME) + '=' + taskPath)
7778

7879
jvmArgs.add("-javaagent:" + config.ciVisibilityAgentJarFile.toPath())
7980

‎dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.gradle;
22

33
import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION;
4-
import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
4+
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName;
55

66
import datadog.environment.SystemProperties;
77
import datadog.trace.api.Config;

‎dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.smoketest
22

3-
43
import datadog.trace.api.civisibility.CIConstants
54
import datadog.trace.api.config.CiVisibilityConfig
65
import datadog.trace.api.config.GeneralConfig
@@ -20,7 +19,11 @@ import spock.util.environment.Jvm
2019

2120
import javax.xml.parsers.DocumentBuilder
2221
import javax.xml.parsers.DocumentBuilderFactory
23-
import java.nio.file.*
22+
import java.nio.file.FileVisitResult
23+
import java.nio.file.Files
24+
import java.nio.file.Path
25+
import java.nio.file.Paths
26+
import java.nio.file.SimpleFileVisitor
2427
import java.nio.file.attribute.BasicFileAttributes
2528
import java.util.concurrent.TimeUnit
2629
import java.util.concurrent.TimeoutException

0 commit comments

Comments
 (0)