Skip to content

Commit 7091719

Browse files
authored
Rename logback mdc library package name (#7752)
1 parent 2e2e891 commit 7091719

File tree

9 files changed

+12
-11
lines changed

9 files changed

+12
-11
lines changed

instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LoggingEventInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.opentelemetry.api.trace.SpanContext;
2121
import io.opentelemetry.context.Context;
2222
import io.opentelemetry.instrumentation.api.util.VirtualField;
23-
import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
23+
import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
2424
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
2525
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2626
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/logback/logback-mdc-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.logback.v1_0
77

8-
import io.opentelemetry.instrumentation.logback.v1_0.AbstractLogbackTest
8+
import io.opentelemetry.instrumentation.logback.mdc.v1_0.AbstractLogbackTest
99
import io.opentelemetry.instrumentation.test.AgentTestTrait
1010

1111
class LogbackTest extends AbstractLogbackTest implements AgentTestTrait {
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0;
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0;
77

88
import ch.qos.logback.classic.Level;
99
import ch.qos.logback.classic.spi.ILoggingEvent;
+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0;
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0;
77

88
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
99
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
@@ -16,7 +16,7 @@
1616
import ch.qos.logback.core.spi.AppenderAttachableImpl;
1717
import io.opentelemetry.api.trace.Span;
1818
import io.opentelemetry.api.trace.SpanContext;
19-
import io.opentelemetry.instrumentation.logback.v1_0.internal.UnionMap;
19+
import io.opentelemetry.instrumentation.logback.mdc.v1_0.internal.UnionMap;
2020
import java.util.HashMap;
2121
import java.util.Iterator;
2222
import java.util.Map;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0.internal;
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0.internal;
77

88
import java.util.AbstractMap;
99
import java.util.AbstractSet;
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0
77

88
import io.opentelemetry.instrumentation.test.LibraryTestTrait
99

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0.internal
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0.internal
77

88
import spock.lang.Specification
99

instrumentation/logback/logback-mdc-1.0/library/src/test/resources/logback.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
<configuration>
1919
<appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/>
2020

21-
<appender name="OTEL" class="io.opentelemetry.instrumentation.logback.v1_0.OpenTelemetryAppender">
21+
<appender name="OTEL"
22+
class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
2223
<appender-ref ref="LIST"/>
2324
</appender>
2425

2526
<logger name="test">
2627
<level value="info"/>
2728
<appender-ref ref="OTEL"/>
2829
</logger>
29-
</configuration>
30+
</configuration>
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.logback.v1_0
6+
package io.opentelemetry.instrumentation.logback.mdc.v1_0
77

88
import ch.qos.logback.classic.spi.ILoggingEvent
99
import ch.qos.logback.core.read.ListAppender

0 commit comments

Comments
 (0)