Skip to content

Commit 18a277f

Browse files
authored
Add missing assertInverse (#12409)
1 parent c743b6d commit 18a277f

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

instrumentation/jsp-2.3/javaagent/build.gradle.kts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff 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

instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ muzzle {
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

instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ muzzle {
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

instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,26 @@
55

66
package io.opentelemetry.javaagent.instrumentation.log4j.mdc.v1_2;
77

8+
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
89
import static java.util.Arrays.asList;
910

1011
import com.google.auto.service.AutoService;
1112
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
1213
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1314
import java.util.List;
15+
import net.bytebuddy.matcher.ElementMatcher;
1416

1517
@AutoService(InstrumentationModule.class)
1618
public 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());

0 commit comments

Comments
 (0)