Skip to content

Commit 78c839c

Browse files
committed
Remove AgentInstrumentationConfig usage
1 parent 6646590 commit 78c839c

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

agent/instrumentation/methods/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/ai/MethodInstrumentationModule.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import static java.util.Collections.emptyList;
1414

1515
import com.google.auto.service.AutoService;
16-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1716
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1817
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1918
import io.opentelemetry.javaagent.tooling.config.MethodsConfigurationParser;
19+
import java.util.Collections;
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
@@ -32,9 +32,10 @@ public class MethodInstrumentationModule extends InstrumentationModule {
3232
public MethodInstrumentationModule() {
3333
super("ai-methods");
3434

35+
String include = System.getProperty(TRACE_METHODS_CONFIG);
36+
3537
Map<String, Set<String>> classMethodsToTrace =
36-
MethodsConfigurationParser.parse(
37-
AgentInstrumentationConfig.get().getString(TRACE_METHODS_CONFIG));
38+
include == null ? Collections.emptyMap() : MethodsConfigurationParser.parse(include);
3839

3940
typeInstrumentations =
4041
classMethodsToTrace.entrySet().stream()

agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/ai/AzureMonitorRegistryConfig.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package io.opentelemetry.javaagent.instrumentation.micrometer.ai;
55

66
import io.micrometer.core.instrument.step.StepRegistryConfig;
7-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
87
import java.time.Duration;
98
import javax.annotation.Nullable;
109

@@ -16,13 +15,22 @@ public class AzureMonitorRegistryConfig implements StepRegistryConfig {
1615
public static final AzureMonitorRegistryConfig INSTANCE = new AzureMonitorRegistryConfig();
1716

1817
private AzureMonitorRegistryConfig() {
19-
step =
20-
AgentInstrumentationConfig.get()
21-
.getDuration(
22-
"applicationinsights.internal.micrometer.step.millis", Duration.ofSeconds(60));
23-
namespace =
24-
AgentInstrumentationConfig.get()
25-
.getString("applicationinsights.internal.micrometer.namespace");
18+
Duration defaultStep = Duration.ofSeconds(60);
19+
20+
String stepMillisString =
21+
System.getProperty("applicationinsights.internal.micrometer.step.millis");
22+
Duration resolvedStep = defaultStep;
23+
if (stepMillisString != null) {
24+
try {
25+
long millis = Long.parseLong(stepMillisString);
26+
resolvedStep = Duration.ofMillis(millis);
27+
} catch (NumberFormatException ignored) {
28+
// use default step
29+
}
30+
}
31+
step = resolvedStep;
32+
33+
namespace = System.getProperty("applicationinsights.internal.micrometer.namespace");
2634
}
2735

2836
@Override

0 commit comments

Comments
 (0)