Skip to content

Commit cc9034f

Browse files
trasktrask
authored
Migrate most of the remaining AgentInstrumentationConfig.get() usages to declarative config API (#15722)
1 parent f542b30 commit cc9034f

File tree

39 files changed

+204
-221
lines changed

39 files changed

+204
-221
lines changed

‎instrumentation/apache-elasticjob-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheelasticjob/v3_0/ElasticJobSingletons.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.api.common.AttributeKey;
10+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
1011
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
1112
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
1213
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1314
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1415
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
15-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1616

1717
public final class ElasticJobSingletons {
1818
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-elasticjob-3.0";
1919
private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
20-
AgentInstrumentationConfig.get()
21-
.getBoolean("otel.instrumentation.apache-elasticjob.experimental-span-attributes", false);
20+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "apache_elasticjob")
21+
.getBoolean("experimental_span_attributes/development", false);
2222

2323
private static final Instrumenter<ElasticJobProcessRequest, Void> INSTRUMENTER =
2424
createInstrumenter();

‎instrumentation/apache-shenyu-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apacheshenyu/v2_4/MetaDataHelper.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55

66
package io.opentelemetry.javaagent.instrumentation.apacheshenyu.v2_4;
77

8+
import io.opentelemetry.api.GlobalOpenTelemetry;
89
import io.opentelemetry.api.common.AttributeKey;
910
import io.opentelemetry.api.trace.Span;
1011
import io.opentelemetry.context.Context;
12+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
1113
import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
12-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1314
import org.apache.shenyu.common.dto.MetaData;
1415

1516
public final class MetaDataHelper {
@@ -58,8 +59,8 @@ public final class MetaDataHelper {
5859

5960
static {
6061
CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
61-
AgentInstrumentationConfig.get()
62-
.getBoolean("otel.instrumentation.apache-shenyu.experimental-span-attributes", false);
62+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "apache_shenyu")
63+
.getBoolean("experimental_span_attributes/development", false);
6364
}
6465

6566
private MetaDataHelper() {}

‎instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323

2424
package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
2525

26+
import io.opentelemetry.api.GlobalOpenTelemetry;
2627
import io.opentelemetry.api.common.AttributesBuilder;
2728
import io.opentelemetry.api.trace.SpanKind;
2829
import io.opentelemetry.context.Context;
29-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
30+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
3031
import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
3132
import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator;
3233
import java.util.Collections;
@@ -41,8 +42,8 @@
4142
class BaseSpanDecorator implements SpanDecorator {
4243

4344
static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
44-
AgentInstrumentationConfig.get()
45-
.getBoolean("otel.instrumentation.camel.experimental-span-attributes", false);
45+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "camel")
46+
.getBoolean("experimental_span_attributes/development", false);
4647

4748
static final String DEFAULT_OPERATION_NAME = "CamelOperation";
4849

‎instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSingletons.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
910
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
1011
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientMetrics;
1112
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
1213
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1314
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
1415
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
1516
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
16-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1717

1818
public final class CouchbaseSingletons {
1919

@@ -35,8 +35,8 @@ public final class CouchbaseSingletons {
3535
CouchbaseRequestInfo.init(context, couchbaseRequest))
3636
.addOperationMetrics(DbClientMetrics.get());
3737

38-
if (AgentInstrumentationConfig.get()
39-
.getBoolean("otel.instrumentation.couchbase.experimental-span-attributes", false)) {
38+
if (DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "couchbase")
39+
.getBoolean("experimental_span_attributes/development", false)) {
4040
builder.addAttributesExtractor(new ExperimentalAttributesExtractor());
4141
}
4242

‎instrumentation/elasticsearch/elasticsearch-rest-common-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchRestJavaagentInstrumenterFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
910
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1011
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestInstrumenterFactory;
1112
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
1213
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
13-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1414
import java.util.Collections;
1515
import java.util.function.Function;
1616
import org.elasticsearch.client.Response;
1717

1818
public final class ElasticsearchRestJavaagentInstrumenterFactory {
1919

2020
private static final boolean CAPTURE_SEARCH_QUERY =
21-
AgentInstrumentationConfig.get()
22-
.getBoolean("otel.instrumentation.elasticsearch.capture-search-query", false);
21+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "elasticsearch")
22+
.getBoolean("capture_search_query", false);
2323

2424
private ElasticsearchRestJavaagentInstrumenterFactory() {}
2525

‎instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportInstrumenterFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
910
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
1011
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientMetrics;
1112
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
1213
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
1314
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1415
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
1516
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
16-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1717
import org.elasticsearch.action.ActionResponse;
1818

1919
public final class ElasticsearchTransportInstrumenterFactory {
2020
private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
21-
AgentInstrumentationConfig.get()
22-
.getBoolean("otel.instrumentation.elasticsearch.experimental-span-attributes", false);
21+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "elasticsearch")
22+
.getBoolean("experimental_span_attributes/development", false);
2323

2424
public static Instrumenter<ElasticTransportRequest, ActionResponse> create(
2525
String instrumentationName,

‎instrumentation/executors/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/executors/ExecutorMatchers.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import static net.bytebuddy.matcher.ElementMatchers.any;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
1414

15-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
15+
import io.opentelemetry.api.GlobalOpenTelemetry;
16+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
1617
import java.util.Arrays;
1718
import java.util.Collections;
1819
import java.util.HashSet;
@@ -98,16 +99,16 @@ final class ExecutorMatchers {
9899
"scala.concurrent.Future$InternalCallbackExecutor$",
99100
"scala.concurrent.impl.ExecutionContextImpl"));
100101
combined.addAll(
101-
AgentInstrumentationConfig.get()
102-
.getList("otel.instrumentation.executors.include", emptyList()));
102+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "executors")
103+
.getScalarList("include", String.class, emptyList()));
103104
INSTRUMENTED_EXECUTOR_NAMES = Collections.unmodifiableSet(combined);
104105

105106
INSTRUMENTED_EXECUTOR_PREFIXES = Collections.singletonList("slick.util.AsyncExecutor$");
106107
}
107108

108109
static ElementMatcher.Junction<TypeDescription> executorNameMatcher() {
109-
if (AgentInstrumentationConfig.get()
110-
.getBoolean("otel.instrumentation.executors.include-all", false)) {
110+
if (DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "executors")
111+
.getBoolean("include_all", false)) {
111112
return any();
112113
}
113114

‎instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcSingletons.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import io.grpc.ServerBuilder;
1414
import io.grpc.ServerInterceptor;
1515
import io.opentelemetry.api.GlobalOpenTelemetry;
16+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
1617
import io.opentelemetry.instrumentation.api.util.VirtualField;
1718
import io.opentelemetry.instrumentation.grpc.v1_6.GrpcTelemetry;
1819
import io.opentelemetry.instrumentation.grpc.v1_6.internal.ContextStorageBridge;
19-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
2020
import java.util.List;
2121
import java.util.concurrent.atomic.AtomicReference;
2222

@@ -38,19 +38,23 @@ public final class GrpcSingletons {
3838

3939
static {
4040
boolean emitMessageEvents =
41-
AgentInstrumentationConfig.get()
42-
.getBoolean("otel.instrumentation.grpc.emit-message-events", true);
41+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
42+
.getBoolean("emit_message_events", true);
4343

4444
boolean experimentalSpanAttributes =
45-
AgentInstrumentationConfig.get()
46-
.getBoolean("otel.instrumentation.grpc.experimental-span-attributes", false);
45+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
46+
.getBoolean("experimental_span_attributes/development", false);
4747

4848
List<String> clientRequestMetadata =
49-
AgentInstrumentationConfig.get()
50-
.getList("otel.instrumentation.grpc.capture-metadata.client.request", emptyList());
49+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
50+
.get("capture_metadata")
51+
.get("client")
52+
.getScalarList("request", String.class, emptyList());
5153
List<String> serverRequestMetadata =
52-
AgentInstrumentationConfig.get()
53-
.getList("otel.instrumentation.grpc.capture-metadata.server.request", emptyList());
54+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "grpc")
55+
.get("capture_metadata")
56+
.get("server")
57+
.getScalarList("request", String.class, emptyList());
5458

5559
GrpcTelemetry telemetry =
5660
GrpcTelemetry.builder(GlobalOpenTelemetry.get())

‎instrumentation/guava-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/guava/v10_0/InstrumentationHelper.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55

66
package io.opentelemetry.javaagent.instrumentation.guava.v10_0;
77

8+
import io.opentelemetry.api.GlobalOpenTelemetry;
89
import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
10+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
911
import io.opentelemetry.instrumentation.guava.v10_0.GuavaAsyncOperationEndStrategy;
10-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1112

1213
public final class InstrumentationHelper {
1314
static {
1415
asyncOperationEndStrategy =
1516
GuavaAsyncOperationEndStrategy.builder()
1617
.setCaptureExperimentalSpanAttributes(
17-
AgentInstrumentationConfig.get()
18-
.getBoolean("otel.instrumentation.guava.experimental-span-attributes", false))
18+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "guava")
19+
.getBoolean("experimental_span_attributes/development", false))
1920
.build();
2021

2122
registerAsyncSpanEndStrategy();

‎instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/HibernateInstrumenterFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
package io.opentelemetry.javaagent.instrumentation.hibernate;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
9+
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
910
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1011
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
11-
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
1212

1313
public final class HibernateInstrumenterFactory {
1414
static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
15-
AgentInstrumentationConfig.get()
16-
.getBoolean("otel.instrumentation.hibernate.experimental-span-attributes", false);
15+
DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "hibernate")
16+
.getBoolean("experimental_span_attributes/development", false);
1717

1818
public static Instrumenter<HibernateOperation, Void> createInstrumenter(
1919
String instrumentationName) {

0 commit comments

Comments
 (0)