rename to NettyConnectionInstrumentationFlag

open-telemetry · Aug 1, 2023 · 25eb375 · 25eb375
1 parent 1c78bf8
commit 25eb375
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/...metry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java b/...metry/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<String, String> peerServiceMapping;
   private final boolean emitExperimentalHttpClientMetrics;
 
   public NettyClientInstrumenterFactory(
       OpenTelemetry openTelemetry,
       String instrumentationName,
-      NettyInstrumentationFlag connectionTelemetryState,
-      NettyInstrumentationFlag sslTelemetryState,
+      NettyConnectionInstrumentationFlag connectionTelemetryState,
+      NettyConnectionInstrumentationFlag sslTelemetryState,
       Map<String, String> peerServiceMapping,
       boolean emitExperimentalHttpClientMetrics) {
     this.openTelemetry = openTelemetry;
@@ -83,12 +83,12 @@ public Instrumenter<HttpRequestAndChannel, HttpResponse> createHttpInstrumenter(
   }
 
   public NettyConnectionInstrumenter createConnectionInstrumenter() {
-    if (connectionTelemetryState == NettyInstrumentationFlag.DISABLED) {
+    if (connectionTelemetryState == NettyConnectionInstrumentationFlag.DISABLED) {
       return NoopConnectionInstrumenter.INSTANCE;
     }
 
     boolean connectionTelemetryFullyEnabled =
-        connectionTelemetryState == NettyInstrumentationFlag.ENABLED;
+        connectionTelemetryState == NettyConnectionInstrumentationFlag.ENABLED;
 
     Instrumenter<NettyConnectionRequest, Channel> instrumenter =
         Instrumenter.<NettyConnectionRequest, Channel>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<NettySslRequest, Void> instrumenter =
         Instrumenter.<NettySslRequest, Void>builder(

diff --git a/...rnal/client/NettyInstrumentationFlag.java → ...t/NettyConnectionInstrumentationFlag.java b/...rnal/client/NettyInstrumentationFlag.java → ...t/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/...a/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyClientSingletons.java b/...a/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/...ain/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyClientSingletons.java b/...ain/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/...rc/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java b/...rc/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/.../io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettySingletons.java b/.../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();