Skip to content

Commit 5ca61c0

Browse files
committed
refactor ConfigHelper to datadog.trace.api
1 parent 7a1517e commit 5ca61c0

File tree

27 files changed

+26
-29
lines changed

27 files changed

+26
-29
lines changed

components/environment/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ val excludedClassesCoverage by extra {
6363
"datadog.environment.JavaVirtualMachine.JvmOptionsHolder", // depends on OS and JVM vendor
6464
"datadog.environment.JvmOptions", // depends on OS and JVM vendor
6565
"datadog.environment.OperatingSystem", // depends on OS
66-
"datadog.environment.SupportedConfigurationSource", // wrapper class
6766
)
6867
}
6968
val excludedClassesBranchCoverage by extra {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
1818
import static datadog.trace.util.Strings.toEnvVar;
1919

20-
import datadog.environment.ConfigHelper;
2120
import datadog.environment.EnvironmentVariables;
2221
import datadog.environment.JavaVirtualMachine;
2322
import datadog.environment.OperatingSystem;
2423
import datadog.environment.SystemProperties;
2524
import datadog.trace.api.Config;
25+
import datadog.trace.api.ConfigHelper;
2626
import datadog.trace.api.Platform;
2727
import datadog.trace.api.StatsDClientManager;
2828
import datadog.trace.api.WithGlobalTracer;

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Library.java

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

3-
import datadog.environment.ConfigHelper;
3+
import datadog.trace.api.ConfigHelper;
44
import java.util.EnumSet;
55
import org.slf4j.Logger;
66

dd-java-agent/agent-builder/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.agent.test
22

3-
import datadog.environment.ConfigHelper
3+
import datadog.trace.api.ConfigHelper
44
import datadog.trace.agent.tooling.InstrumenterModule
55
import datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers
66
import datadog.trace.agent.tooling.bytebuddy.outline.TypePoolFacade

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

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

3-
import datadog.environment.ConfigHelper;
43
import datadog.environment.SystemProperties;
4+
import datadog.trace.api.ConfigHelper;
55
import datadog.trace.api.Platform;
66
import datadog.trace.logging.LogLevel;
77
import datadog.trace.logging.LogLevelSwitcher;

dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import com.amazonaws.services.lambda.runtime.Context;
1717
import com.amazonaws.services.lambda.runtime.RequestHandler;
1818
import com.google.auto.service.AutoService;
19-
import datadog.environment.ConfigHelper;
2019
import datadog.trace.agent.tooling.Instrumenter;
2120
import datadog.trace.agent.tooling.InstrumenterModule;
21+
import datadog.trace.api.ConfigHelper;
2222
import datadog.trace.bootstrap.CallDepthThreadLocalMap;
2323
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
2424
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;

dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java

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

3-
import datadog.environment.ConfigHelper;
3+
import datadog.trace.api.ConfigHelper;
44
import datadog.trace.api.civisibility.domain.JavaAgent;
55
import datadog.trace.util.MethodHandles;
66
import datadog.trace.util.Strings;

gradle/configInversionLinter.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ tasks.register('checkEnvironmentVariablesUsage') {
8080

8181
// Exclude specific files (relative to projectDir)
8282
exclude '**/build/**'
83-
exclude 'components/environment/src/main/java/datadog/environment/ConfigHelper.java'
83+
exclude 'internal-api/src/main/java/datadog/trace/api/ConfigHelper.java'
8484
}
8585

8686
def matches = []

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,6 @@
633633
import static datadog.trace.util.CollectionUtils.tryMakeImmutableSet;
634634
import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName;
635635

636-
import datadog.environment.ConfigHelper;
637636
import datadog.environment.JavaVirtualMachine;
638637
import datadog.environment.OperatingSystem;
639638
import datadog.environment.SystemProperties;

components/environment/src/main/java/datadog/environment/ConfigHelper.java renamed to internal-api/src/main/java/datadog/trace/api/ConfigHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package datadog.environment;
1+
package datadog.trace.api;
22

3-
import datadog.trace.api.ConfigInversionStrictStyle;
3+
import datadog.environment.EnvironmentVariables;
44
import de.thetaphi.forbiddenapis.SuppressForbidden;
55
import java.util.LinkedHashMap;
66
import java.util.List;

0 commit comments

Comments
 (0)