address review comments

Author: laurit

docs/instrumentation-list.yaml

@@ -9681,14 +9681,14 @@ libraries:
       Specifies the key name used to store the trace ID in the logging context.
     type: string
     default: trace_id
-  - name: otel.instrumentation.common.logging.span-id
-    declarative_name: java.common.logging.span_id
+  - name: otel.instrumentation.common.logging.span-id-key
+    declarative_name: java.common.logging.span_id_key
     description: |
       Specifies the key name used to store the span ID in the logging context.
     type: string
     default: span_id
-  - name: otel.instrumentation.common.logging.trace-flags
-    declarative_name: java.common.logging.trace_flags
+  - name: otel.instrumentation.common.logging.trace-flags-key
+    declarative_name: java.common.logging.trace_flags_key
     description: |
       Specifies the key name used to store the trace flags in the logging context.
     type: string

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

@@ -23,7 +23,6 @@ public final class ContextDataKeys {
   private final String spanIdKey;
   private final String traceFlags;
 
-  @SuppressWarnings("deprecation") // using deprecated config property
   public static ContextDataKeys create(OpenTelemetry openTelemetry) {
     DeclarativeConfigProperties logging =
         DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "common").get("logging");
@@ -60,7 +59,7 @@ public static ContextDataKeys create(OpenTelemetry openTelemetry) {
     return new ContextDataKeys(traceIdKey, spanIdKey, traceFlagsKey);
   }
 
-  @SuppressWarnings("deprecation") // using deprecated config property
+  @SuppressWarnings("deprecation") // using deprecated ConfigPropertiesUtil
   private static String getConfig(
       DeclarativeConfigProperties config,
       String newDeclarativeKey,