pr review

Author: zeitlinger

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java

@@ -17,7 +17,6 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.ExtendedDeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.instrumentation.awssdk.v1_11.AwsSdkTelemetry;
-import java.util.Optional;
 
 /**
  * A {@link RequestHandler2} for use as an SPI by the AWS SDK to automatically trace all requests.

instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/OpenTelemetryAppender.java

@@ -323,10 +323,11 @@ private void emit(OpenTelemetry openTelemetry, LogEvent event) {
     // reconstruct the context from context data
     if (context == Context.root()) {
       ContextDataAccessor<ReadOnlyStringMap> contextDataAccessor = ContextDataAccessorImpl.INSTANCE;
-      String traceId = contextDataAccessor.getValue(contextData, ContextDataKeys.TRACE_ID_KEY);
-      String spanId = contextDataAccessor.getValue(contextData, ContextDataKeys.SPAN_ID_KEY);
+      ContextDataKeys contextDataKeys = ContextDataKeys.create(openTelemetry);
+      String traceId = contextDataAccessor.getValue(contextData, contextDataKeys.getTraceIdKey());
+      String spanId = contextDataAccessor.getValue(contextData, contextDataKeys.getSpanIdKey());
       String traceFlags =
-          contextDataAccessor.getValue(contextData, ContextDataKeys.TRACE_FLAGS_KEY);
+          contextDataAccessor.getValue(contextData, contextDataKeys.getTraceFlags());
       if (traceId != null && spanId != null && traceFlags != null) {
         context =
             Context.root()

instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/OpenTelemetryContextDataProvider.java

@@ -76,16 +76,17 @@ public Map<String, String> supplyContextData() {
       return staticContextData;
     }
 
-    if (ThreadContext.containsKey(ContextDataKeys.TRACE_ID_KEY)) {
+    ContextDataKeys contextDataKeys = ContextDataKeys.create(GlobalOpenTelemetry.get());
+    if (ThreadContext.containsKey(contextDataKeys.getTraceIdKey())) {
       // Assume already instrumented event if traceId is present.
       return staticContextData;
     }
 
     Map<String, String> contextData = new HashMap<>(staticContextData);
     SpanContext spanContext = currentSpan.getSpanContext();
-    contextData.put(ContextDataKeys.TRACE_ID_KEY, spanContext.getTraceId());
-    contextData.put(ContextDataKeys.SPAN_ID_KEY, spanContext.getSpanId());
-    contextData.put(ContextDataKeys.TRACE_FLAGS_KEY, spanContext.getTraceFlags().asHex());
+    contextData.put(contextDataKeys.getTraceIdKey(), spanContext.getTraceId());
+    contextData.put(contextDataKeys.getSpanIdKey(), spanContext.getSpanId());
+    contextData.put(contextDataKeys.getTraceFlags(), spanContext.getTraceFlags().asHex());
 
     if (BAGGAGE_ENABLED) {
       Baggage baggage = Baggage.fromContext(context);

instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/contextdata/v2_17/internal/ContextDataKeys.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.log4j.contextdata.v2_17.internal;
 
-import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.log.LoggingContextConstants;
@@ -16,33 +16,45 @@
  * any time.
  */
 public final class ContextDataKeys {
-  public static final String TRACE_ID_KEY =
-      getLogging()
-          .getString(
-              "trace_id",
-              ConfigPropertiesUtil.getString(
-                  "otel.instrumentation.common.logging.trace-id",
-                  LoggingContextConstants.TRACE_ID));
-
-  public static final String SPAN_ID_KEY =
-      getLogging()
-          .getString(
-              "span_id",
-              ConfigPropertiesUtil.getString(
-                  "otel.instrumentation.common.logging.span-id", LoggingContextConstants.SPAN_ID));
-
-  public static final String TRACE_FLAGS_KEY =
-      getLogging()
-          .getString(
-              "trace_flags",
-              ConfigPropertiesUtil.getString(
-                  "otel.instrumentation.common.logging.trace-flags",
-                  LoggingContextConstants.TRACE_FLAGS));
-
-  private static DeclarativeConfigProperties getLogging() {
-    return DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "common")
-        .get("logging");
+
+  private final String traceIdKey;
+  private final String spanIdKey;
+  private final String traceFlags;
+
+  private ContextDataKeys(String traceIdKey, String spanIdKey, String traceFlags) {
+    this.traceIdKey = traceIdKey;
+    this.spanIdKey = spanIdKey;
+    this.traceFlags = traceFlags;
   }
 
-  private ContextDataKeys() {}
+  public static ContextDataKeys create(OpenTelemetry openTelemetry) {
+    DeclarativeConfigProperties logging =
+        DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common").get("logging");
+    return new ContextDataKeys(
+        logging.getString(
+            "trace_id",
+            ConfigPropertiesUtil.getString(
+                "otel.instrumentation.common.logging.trace-id", LoggingContextConstants.TRACE_ID)),
+        logging.getString(
+            "span_id",
+            ConfigPropertiesUtil.getString(
+                "otel.instrumentation.common.logging.span-id", LoggingContextConstants.SPAN_ID)),
+        logging.getString(
+            "trace_flags",
+            ConfigPropertiesUtil.getString(
+                "otel.instrumentation.common.logging.trace-flags",
+                LoggingContextConstants.TRACE_FLAGS)));
+  }
+
+  public String getTraceIdKey() {
+    return traceIdKey;
+  }
+
+  public String getSpanIdKey() {
+    return spanIdKey;
+  }
+
+  public String getTraceFlags() {
+    return traceFlags;
+  }
 }