Skip to content
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

Jump to bottom

Add log4j2 appender javaagent instrumentation #4944

Merged
merged 8 commits into from
Dec 20, 2021
Merged

Add log4j2 appender javaagent instrumentation #4944

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8dae85b
log4j2
trask Dec 20, 2021
fd351d7
Spotless
trask Dec 20, 2021
f22debb
Merge remote-tracking branch 'upstream/main' into add-log4j2-logging-…
trask Dec 20, 2021
5848741
Target 2.16 for javaagent instrumentation and share
trask Dec 20, 2021
40e28da
review feedback
trask Dec 20, 2021
4474a11
Add comment
trask Dec 20, 2021
15e978c
Remove unnecessary configuration
trask Dec 20, 2021
2c27e59
Fix comment
trask Dec 20, 2021
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
Prev Previous commit
Next Next commit
review feedback
  • Loading branch information
@trask
trask committed Dec 20, 2021
commit 40e28dad7692bc4f1d8a5aca76ad7229c46a89cd
8 changes: 4 additions & 4 deletions ...er/v2_0/Log4jAppenderInstrumentation.java → ...r/v2_16/Log4jAppenderInstrumentation.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.javaagent.instrumentation.log4j.appender.v2_0;
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
Expand Down Expand Up @@ -46,10 +46,10 @@ public void transform(TypeTransformer transformer) {
.and(takesArguments(6))
.and(takesArgument(0, named("org.apache.logging.log4j.Level")))
.and(takesArgument(1, named("org.apache.logging.log4j.Marker")))
.and(takesArgument(2, named("java.lang.String")))
.and(takesArgument(3, named("java.lang.StackTraceElement")))
.and(takesArgument(2, String.class))
.and(takesArgument(3, StackTraceElement.class))
.and(takesArgument(4, named("org.apache.logging.log4j.message.Message")))
.and(takesArgument(5, named("java.lang.Throwable"))),
.and(takesArgument(5, Throwable.class)),
Log4jAppenderInstrumentation.class.getName() + "$LogAdvice");
}

Expand Down
4 changes: 2 additions & 2 deletions ...0/Log4jAppenderInstrumentationModule.java → ...6/Log4jAppenderInstrumentationModule.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.javaagent.instrumentation.log4j.appender.v2_0;
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;

import static java.util.Collections.singletonList;

Expand All @@ -16,7 +16,7 @@
public class Log4jAppenderInstrumentationModule extends InstrumentationModule {

public Log4jAppenderInstrumentationModule() {
super("log4j-appender", "log4j-appender-2.0");
super("log4j-appender", "log4j-appender-2.16");
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...tion/log4j/appender/v2_0/Log4jHelper.java → ...ion/log4j/appender/v2_16/Log4jHelper.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.javaagent.instrumentation.log4j.appender.v2_0;
package io.opentelemetry.javaagent.instrumentation.log4j.appender.v2_16;

import io.opentelemetry.instrumentation.api.appender.GlobalLogEmitterProvider;
import io.opentelemetry.instrumentation.api.appender.LogBuilder;
Expand All @@ -12,7 +12,7 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.Message;

public class Log4jHelper {
public final class Log4jHelper {

public static void capture(Logger logger, Level level, Message message, Throwable throwable) {

Expand All @@ -26,4 +26,6 @@ public static void capture(Logger logger, Level level, Message message, Throwabl

builder.emit();
}

private Log4jHelper() {}
}
2 changes: 2 additions & 0 deletions instrumentation/log4j/log4j-appender-2.16/javaagent/src/test/groovy/Log4j2Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import io.opentelemetry.sdk.logs.data.Severity
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import org.apache.logging.log4j.LogManager
import org.apache.logging.log4j.Logger
import spock.lang.Unroll

import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
import static org.assertj.core.api.Assertions.assertThat
Expand All @@ -17,6 +18,7 @@ class Log4j2Test extends AgentInstrumentationSpecification {

private static final Logger logger = LogManager.getLogger("abc")

@Unroll
def "test method=#testMethod with exception=#exception and parent=#parent"() {
when:
if (parent) {
Expand Down