Skip to content

Rename logback mdc library package name #7752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2023
Merged

Rename logback mdc library package name #7752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LoggingEventInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ion/logback/v1_0/LoggingEventWrapper.java → ...logback/mdc/v1_0/LoggingEventWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n/logback/v1_0/OpenTelemetryAppender.java → ...gback/mdc/v1_0/OpenTelemetryAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ation/logback/v1_0/internal/UnionMap.java → ...n/logback/mdc/v1_0/internal/UnionMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mentation/logback/v1_0/LogbackTest.groovy → ...ation/logback/mdc/v1_0/LogbackTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...logback/v1_0/internal/UnionMapTest.groovy → ...ack/mdc/v1_0/internal/UnionMapTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions instrumentation/logback/logback-mdc-1.0/library/src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...n/logback/v1_0/AbstractLogbackTest.groovy → ...gback/mdc/v1_0/AbstractLogbackTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down