diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java index 8a30bd11231a..1420d63c0d33 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java @@ -34,16 +34,16 @@ public final class NettyClientInstrumenterFactory { private final OpenTelemetry openTelemetry; private final String instrumentationName; - private final NettyInstrumentationFlag connectionTelemetryState; - private final NettyInstrumentationFlag sslTelemetryState; + private final NettyConnectionInstrumentationFlag connectionTelemetryState; + private final NettyConnectionInstrumentationFlag sslTelemetryState; private final Map peerServiceMapping; private final boolean emitExperimentalHttpClientMetrics; public NettyClientInstrumenterFactory( OpenTelemetry openTelemetry, String instrumentationName, - NettyInstrumentationFlag connectionTelemetryState, - NettyInstrumentationFlag sslTelemetryState, + NettyConnectionInstrumentationFlag connectionTelemetryState, + NettyConnectionInstrumentationFlag sslTelemetryState, Map peerServiceMapping, boolean emitExperimentalHttpClientMetrics) { this.openTelemetry = openTelemetry; @@ -83,12 +83,12 @@ public Instrumenter createHttpInstrumenter( } public NettyConnectionInstrumenter createConnectionInstrumenter() { - if (connectionTelemetryState == NettyInstrumentationFlag.DISABLED) { + if (connectionTelemetryState == NettyConnectionInstrumentationFlag.DISABLED) { return NoopConnectionInstrumenter.INSTANCE; } boolean connectionTelemetryFullyEnabled = - connectionTelemetryState == NettyInstrumentationFlag.ENABLED; + connectionTelemetryState == NettyConnectionInstrumentationFlag.ENABLED; Instrumenter instrumenter = Instrumenter.builder( @@ -109,11 +109,12 @@ public NettyConnectionInstrumenter createConnectionInstrumenter() { } public NettySslInstrumenter createSslInstrumenter() { - if (sslTelemetryState == NettyInstrumentationFlag.DISABLED) { + if (sslTelemetryState == NettyConnectionInstrumentationFlag.DISABLED) { return NoopSslInstrumenter.INSTANCE; } - boolean sslTelemetryFullyEnabled = sslTelemetryState == NettyInstrumentationFlag.ENABLED; + boolean sslTelemetryFullyEnabled = + sslTelemetryState == NettyConnectionInstrumentationFlag.ENABLED; NettySslNetAttributesGetter netAttributesGetter = new NettySslNetAttributesGetter(); Instrumenter instrumenter = Instrumenter.builder( diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyInstrumentationFlag.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectionInstrumentationFlag.java similarity index 73% rename from instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyInstrumentationFlag.java rename to instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectionInstrumentationFlag.java index a5fdfbcf6abe..58400aec230d 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyInstrumentationFlag.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyConnectionInstrumentationFlag.java @@ -9,12 +9,12 @@ * This class is internal and is hence not for public use. Its APIs are unstable and can change at * any time. */ -public enum NettyInstrumentationFlag { +public enum NettyConnectionInstrumentationFlag { ENABLED, ERROR_ONLY, DISABLED; - public static NettyInstrumentationFlag enabledOrErrorOnly(boolean b) { + public static NettyConnectionInstrumentationFlag enabledOrErrorOnly(boolean b) { return b ? ENABLED : ERROR_ONLY; } } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java index be82123486dd..bac89dbe1a6f 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.netty.v4_0.client; -import static io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyInstrumentationFlag.enabledOrErrorOnly; +import static io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag.enabledOrErrorOnly; import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.api.GlobalOpenTelemetry; diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java index 02acd8423b46..3842aa3eea7b 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.netty.v4_1; -import static io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyInstrumentationFlag.enabledOrErrorOnly; +import static io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag.enabledOrErrorOnly; import io.netty.handler.codec.http.HttpResponse; import io.opentelemetry.api.GlobalOpenTelemetry; diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java index 07aadaf99ae3..b9bca46de56a 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientAttributesExtractorBuilder; import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel; import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyClientInstrumenterFactory; -import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyInstrumentationFlag; +import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -112,8 +112,8 @@ public NettyClientTelemetry build() { new NettyClientInstrumenterFactory( openTelemetry, "io.opentelemetry.netty-4.1", - NettyInstrumentationFlag.DISABLED, - NettyInstrumentationFlag.DISABLED, + NettyConnectionInstrumentationFlag.DISABLED, + NettyConnectionInstrumentationFlag.DISABLED, Collections.emptyMap(), emitExperimentalHttpClientMetrics) .createHttpInstrumenter(extractorConfigurer, additionalAttributesExtractors)); diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java index c77f078ecd84..0d36c7de6b4e 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java @@ -15,8 +15,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor; import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyClientInstrumenterFactory; +import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag; import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumenter; -import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyInstrumentationFlag; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.DeprecatedConfigProperties; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; @@ -72,9 +72,9 @@ public final class ReactorNettySingletons { GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, connectionTelemetryEnabled - ? NettyInstrumentationFlag.ENABLED - : NettyInstrumentationFlag.DISABLED, - NettyInstrumentationFlag.DISABLED, + ? NettyConnectionInstrumentationFlag.ENABLED + : NettyConnectionInstrumentationFlag.DISABLED, + NettyConnectionInstrumentationFlag.DISABLED, CommonConfig.get().getPeerServiceMapping(), CommonConfig.get().shouldEmitExperimentalHttpClientMetrics()); CONNECTION_INSTRUMENTER = instrumenterFactory.createConnectionInstrumenter();