File tree Expand file tree Collapse file tree 4 files changed +21
-1
lines changed
log4j-appender-1.2/javaagent
src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2 Expand file tree Collapse file tree 4 files changed +21
-1
lines changed Original file line number Diff line number Diff line change @@ -6,11 +6,22 @@ muzzle {
66 pass {
77 group.set(" org.apache.tomcat" )
88 module.set(" tomcat-jasper" )
9- // version range [7.0.0,7.0.19) is missing from maven
109 // tomcat 10 uses JSP 3.0
1110 versions.set(" [7.0.19,10)" )
1211 // version 8.0.9 depends on org.eclipse.jdt.core.compiler:ecj:4.4RC4 which does not exist
1312 skip(" 8.0.9" )
13+ // not using assertInverse.set(true) because org.eclipse.jdt.core.compiler:ecj:xxx dependency
14+ // is missing for versions in range [7.0.0, 7.0.19)
15+ }
16+ fail {
17+ group.set(" org.apache.tomcat" )
18+ module.set(" tomcat-jasper" )
19+ versions.set(" [,7.0.0)" )
20+ }
21+ fail {
22+ group.set(" org.apache.tomcat" )
23+ module.set(" tomcat-jasper" )
24+ versions.set(" [10,)" )
1425 }
1526}
1627
Original file line number Diff line number Diff line change 99 versions.set(" [1.2,)" )
1010 // version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
1111 skip(" 1.2.15" )
12+ assertInverse.set(true )
1213 }
1314}
1415
Original file line number Diff line number Diff line change 99 versions.set(" [1.2,)" )
1010 // version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
1111 skip(" 1.2.15" )
12+ assertInverse.set(true )
1213 }
1314}
1415
Original file line number Diff line number Diff line change 55
66package io .opentelemetry .javaagent .instrumentation .log4j .mdc .v1_2 ;
77
8+ import static io .opentelemetry .javaagent .extension .matcher .AgentElementMatchers .hasClassesNamed ;
89import static java .util .Arrays .asList ;
910
1011import com .google .auto .service .AutoService ;
1112import io .opentelemetry .javaagent .extension .instrumentation .InstrumentationModule ;
1213import io .opentelemetry .javaagent .extension .instrumentation .TypeInstrumentation ;
1314import java .util .List ;
15+ import net .bytebuddy .matcher .ElementMatcher ;
1416
1517@ AutoService (InstrumentationModule .class )
1618public class Log4j1InstrumentationModule extends InstrumentationModule {
1719 public Log4j1InstrumentationModule () {
1820 super ("log4j-mdc" , "log4j-mdc-1.2" );
1921 }
2022
23+ @ Override
24+ public ElementMatcher .Junction <ClassLoader > classLoaderMatcher () {
25+ return hasClassesNamed ("org.apache.log4j.MDC" );
26+ }
27+
2128 @ Override
2229 public List <TypeInstrumentation > typeInstrumentations () {
2330 return asList (new CategoryInstrumentation (), new LoggingEventInstrumentation ());
You can’t perform that action at this time.
0 commit comments