Rename logback mdc library package name (#7752)

open-telemetry · Feb 7, 2023 · 7091719 · 7091719
1 parent 2e2e891
commit 7091719
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/...opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LoggingEventInstrumentation.java b/...opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LoggingEventInstrumentation.java
@@ -20,7 +20,7 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.util.VirtualField;
-import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
+import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

diff --git a/...rc/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy b/...rc/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.logback.v1_0
 
-import io.opentelemetry.instrumentation.logback.v1_0.AbstractLogbackTest
+import io.opentelemetry.instrumentation.logback.mdc.v1_0.AbstractLogbackTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class LogbackTest extends AbstractLogbackTest implements AgentTestTrait {

diff --git a/...ion/logback/v1_0/LoggingEventWrapper.java → ...logback/mdc/v1_0/LoggingEventWrapper.java b/...ion/logback/v1_0/LoggingEventWrapper.java → ...logback/mdc/v1_0/LoggingEventWrapper.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0;
+package io.opentelemetry.instrumentation.logback.mdc.v1_0;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;

diff --git a/...n/logback/v1_0/OpenTelemetryAppender.java → ...gback/mdc/v1_0/OpenTelemetryAppender.java b/...n/logback/v1_0/OpenTelemetryAppender.java → ...gback/mdc/v1_0/OpenTelemetryAppender.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0;
+package io.opentelemetry.instrumentation.logback.mdc.v1_0;
 
 import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
 import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
@@ -16,7 +16,7 @@
 import ch.qos.logback.core.spi.AppenderAttachableImpl;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
-import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
+import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

diff --git a/...ation/logback/v1_0/internal/UnionMap.java → ...n/logback/mdc/v1_0/internal/UnionMap.java b/...ation/logback/v1_0/internal/UnionMap.java → ...n/logback/mdc/v1_0/internal/UnionMap.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0.internal;
+package io.opentelemetry.instrumentation.logback.mdc.v1_0.internal;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;

diff --git a/...mentation/logback/v1_0/LogbackTest.groovy → ...ation/logback/mdc/v1_0/LogbackTest.groovy b/...mentation/logback/v1_0/LogbackTest.groovy → ...ation/logback/mdc/v1_0/LogbackTest.groovy
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0
+package io.opentelemetry.instrumentation.logback.mdc.v1_0
 
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 

diff --git a/...logback/v1_0/internal/UnionMapTest.groovy → ...ack/mdc/v1_0/internal/UnionMapTest.groovy b/...logback/v1_0/internal/UnionMapTest.groovy → ...ack/mdc/v1_0/internal/UnionMapTest.groovy
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0.internal
+package io.opentelemetry.instrumentation.logback.mdc.v1_0.internal
 
 import spock.lang.Specification
 

diff --git a/instrumentation/logback/logback-mdc-1.0/library/src/test/resources/logback.xml b/instrumentation/logback/logback-mdc-1.0/library/src/test/resources/logback.xml
@@ -18,12 +18,13 @@
 <configuration>
   <appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/>
 
-  <appender name="OTEL" class="io.opentelemetry.instrumentation.logback.v1_0.OpenTelemetryAppender">
+  <appender name="OTEL"
+    class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
     <appender-ref ref="LIST"/>
   </appender>
 
   <logger name="test">
     <level value="info"/>
     <appender-ref ref="OTEL"/>
   </logger>
-</configuration>
+</configuration>
diff --git a/...n/logback/v1_0/AbstractLogbackTest.groovy → ...gback/mdc/v1_0/AbstractLogbackTest.groovy b/...n/logback/v1_0/AbstractLogbackTest.groovy → ...gback/mdc/v1_0/AbstractLogbackTest.groovy
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.logback.v1_0
+package io.opentelemetry.instrumentation.logback.mdc.v1_0
 
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.read.ListAppender