Update log4j package names (#5978)
This commit is contained in:
parent
db6142235a
commit
400bd5af3f
|
@ -172,7 +172,7 @@
|
||||||
</module>
|
</module>
|
||||||
<module name="PackageName">
|
<module name="PackageName">
|
||||||
<!-- modified from default to support packages like
|
<!-- modified from default to support packages like
|
||||||
io.opentelemetry.javaagent.instrumentation.log4j.v2_16 and
|
io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_17 and
|
||||||
io.opentelemetry.javaagent.instrumentation.netty.v4_1.client -->
|
io.opentelemetry.javaagent.instrumentation.netty.v4_1.client -->
|
||||||
<property name="format"
|
<property name="format"
|
||||||
value="^[a-z]+(\.[a-z][a-z0-9]*)*(\.v[0-9]+_[0-9]+(_[0-9]+)?)?(\.[a-z][a-z0-9]*)*$"/>
|
value="^[a-z]+(\.[a-z][a-z0-9]*)*(\.v[0-9]+_[0-9]+(_[0-9]+)?)?(\.[a-z][a-z0-9]*)*$"/>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;
|
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_17;
|
||||||
|
|
||||||
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
|
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
|
||||||
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;
|
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_17;
|
||||||
|
|
||||||
import static java.util.Collections.singletonList;
|
import static java.util.Collections.singletonList;
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;
|
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_17;
|
||||||
|
|
||||||
import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
|
import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
|
||||||
import io.opentelemetry.instrumentation.log4j.appender.v2_16.internal.ContextDataAccessor;
|
import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.ContextDataAccessor;
|
||||||
import io.opentelemetry.instrumentation.log4j.appender.v2_16.internal.LogEventMapper;
|
import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.LogEventMapper;
|
||||||
import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
|
import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
|
@ -34,7 +34,7 @@ The following demonstrates how you might configure the appender in your `log4j.x
|
||||||
|
|
||||||
```xml
|
```xml
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Configuration status="WARN" packages="io.opentelemetry.instrumentation.log4j.appender.v2_16">
|
<Configuration status="WARN" packages="io.opentelemetry.instrumentation.log4j.appender.v2_17">
|
||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout
|
<PatternLayout
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.appender.v2_16;
|
package io.opentelemetry.instrumentation.log4j.appender.v2_17;
|
||||||
|
|
||||||
import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
|
import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
|
||||||
import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProvider;
|
import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProvider;
|
||||||
import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProviderHolder;
|
import io.opentelemetry.instrumentation.api.appender.internal.LogEmitterProviderHolder;
|
||||||
import io.opentelemetry.instrumentation.log4j.appender.v2_16.internal.ContextDataAccessor;
|
import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.ContextDataAccessor;
|
||||||
import io.opentelemetry.instrumentation.log4j.appender.v2_16.internal.LogEventMapper;
|
import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.LogEventMapper;
|
||||||
import io.opentelemetry.instrumentation.sdk.appender.internal.DelegatingLogEmitterProvider;
|
import io.opentelemetry.instrumentation.sdk.appender.internal.DelegatingLogEmitterProvider;
|
||||||
import io.opentelemetry.sdk.logs.SdkLogEmitterProvider;
|
import io.opentelemetry.sdk.logs.SdkLogEmitterProvider;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.appender.v2_16.internal;
|
package io.opentelemetry.instrumentation.log4j.appender.v2_17.internal;
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.appender.v2_16.internal;
|
package io.opentelemetry.instrumentation.log4j.appender.v2_17.internal;
|
||||||
|
|
||||||
import static java.util.Collections.emptyList;
|
import static java.util.Collections.emptyList;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.appender.v2_16;
|
package io.opentelemetry.instrumentation.log4j.appender.v2_17;
|
||||||
|
|
||||||
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
|
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.appender.v2_16.internal;
|
package io.opentelemetry.instrumentation.log4j.appender.v2_17.internal;
|
||||||
|
|
||||||
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
|
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
|
||||||
import static java.util.Collections.emptyList;
|
import static java.util.Collections.emptyList;
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<Configuration status="WARN"
|
<Configuration status="WARN"
|
||||||
packages="com.example.appender,io.opentelemetry.instrumentation.log4j.appender.v2_16">
|
packages="com.example.appender,io.opentelemetry.instrumentation.log4j.appender.v2_17">
|
||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<Console name="Console" target="SYSTEM_OUT">
|
||||||
<PatternLayout
|
<PatternLayout
|
||||||
|
|
|
@ -27,7 +27,7 @@ dependencies {
|
||||||
|
|
||||||
testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent"))
|
testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent"))
|
||||||
|
|
||||||
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
|
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v2_16;
|
package io.opentelemetry.javaagent.instrumentation.log4j.contextdata.v2_17;
|
||||||
|
|
||||||
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
||||||
import static java.util.Collections.singletonList;
|
import static java.util.Collections.singletonList;
|
|
@ -7,5 +7,5 @@ base.archivesName.set("${base.archivesName.get()}-autoconfigure")
|
||||||
dependencies {
|
dependencies {
|
||||||
library("org.apache.logging.log4j:log4j-core:2.17.0")
|
library("org.apache.logging.log4j:log4j-core:2.17.0")
|
||||||
|
|
||||||
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
|
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing"))
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.v2_16;
|
package io.opentelemetry.instrumentation.log4j.contextdata.v2_17;
|
||||||
|
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
|
@ -1 +1 @@
|
||||||
io.opentelemetry.instrumentation.log4j.v2_16.OpenTelemetryContextDataProvider
|
io.opentelemetry.instrumentation.log4j.contextdata.v2_17.OpenTelemetryContextDataProvider
|
||||||
|
|
|
@ -16,7 +16,7 @@ dependencies {
|
||||||
|
|
||||||
testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent"))
|
testInstrumentation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent"))
|
||||||
|
|
||||||
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing"))
|
testImplementation(project(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing"))
|
||||||
|
|
||||||
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.16.+") // see log4j-context-data-2.17
|
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.16.+") // see log4j-context-data-2.17
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v2_7;
|
package io.opentelemetry.javaagent.instrumentation.log4j.contextdata.v2_7;
|
||||||
|
|
||||||
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
|
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
|
||||||
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
|
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v2_7;
|
package io.opentelemetry.javaagent.instrumentation.log4j.contextdata.v2_7;
|
||||||
|
|
||||||
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
|
||||||
import static java.util.Collections.singletonList;
|
import static java.util.Collections.singletonList;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v2_7;
|
package io.opentelemetry.javaagent.instrumentation.log4j.contextdata.v2_7;
|
||||||
|
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
|
@ -4,7 +4,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import io.opentelemetry.api.trace.Span
|
import io.opentelemetry.api.trace.Span
|
||||||
import io.opentelemetry.instrumentation.log4j.v2_16.ListAppender
|
import io.opentelemetry.instrumentation.log4j.contextdata.ListAppender
|
||||||
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
|
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
|
||||||
import org.apache.logging.log4j.LogManager
|
import org.apache.logging.log4j.LogManager
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.instrumentation.log4j.v2_16;
|
package io.opentelemetry.instrumentation.log4j.contextdata;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v1_2;
|
package io.opentelemetry.javaagent.instrumentation.log4j.mdc.v1_2;
|
||||||
|
|
||||||
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
|
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
|
||||||
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
|
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v1_2;
|
package io.opentelemetry.javaagent.instrumentation.log4j.mdc.v1_2;
|
||||||
|
|
||||||
import static java.util.Arrays.asList;
|
import static java.util.Arrays.asList;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.log4j.v1_2;
|
package io.opentelemetry.javaagent.instrumentation.log4j.mdc.v1_2;
|
||||||
|
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.SPAN_ID;
|
||||||
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
import static io.opentelemetry.instrumentation.api.log.LoggingContextConstants.TRACE_FLAGS;
|
|
@ -300,7 +300,7 @@ include(":instrumentation:log4j:log4j-mdc-1.2:javaagent")
|
||||||
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent")
|
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent")
|
||||||
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent")
|
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent")
|
||||||
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:library-autoconfigure")
|
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:library-autoconfigure")
|
||||||
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2-common:testing")
|
include(":instrumentation:log4j:log4j-context-data:log4j-context-data-common:testing")
|
||||||
include(":instrumentation:log4j:log4j-appender-2.17:javaagent")
|
include(":instrumentation:log4j:log4j-appender-2.17:javaagent")
|
||||||
include(":instrumentation:log4j:log4j-appender-2.17:library")
|
include(":instrumentation:log4j:log4j-appender-2.17:library")
|
||||||
include(":instrumentation:logback:logback-appender-1.0:javaagent")
|
include(":instrumentation:logback:logback-appender-1.0:javaagent")
|
||||||
|
|
Loading…
Reference in New Issue