Skip to content

Add missing assertInverse #12409

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 4 commits into from
Oct 17, 2024
Merged

Add missing assertInverse #12409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
990dece
Add missing assertInverse
steverao Oct 8, 2024
d6bc843
Address comment problems
steverao Oct 9, 2024
47c20be
Merge branch 'main' into assertInverse
laurit Oct 17, 2024
d67c639
add explicit fail blocks because assertInverse can't be used
laurit Oct 17, 2024
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
13 changes: 12 additions & 1 deletion instrumentation/jsp-2.3/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@ muzzle {
pass {
group.set("org.apache.tomcat")
module.set("tomcat-jasper")
// version range [7.0.0,7.0.19) is missing from maven
// tomcat 10 uses JSP 3.0
versions.set("[7.0.19,10)")
// version 8.0.9 depends on org.eclipse.jdt.core.compiler:ecj:4.4RC4 which does not exist
skip("8.0.9")
// not using assertInverse.set(true) because org.eclipse.jdt.core.compiler:ecj:xxx dependency
// is missing for versions in range [7.0.0, 7.0.19)
}
fail {
group.set("org.apache.tomcat")
module.set("tomcat-jasper")
versions.set("[,7.0.0)")
}
fail {
group.set("org.apache.tomcat")
module.set("tomcat-jasper")
versions.set("[10,)")
}
}

Expand Down
1 change: 1 addition & 0 deletions instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ muzzle {
versions.set("[1.2,)")
// version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
skip("1.2.15")
assertInverse.set(true)
}
}

Expand Down
1 change: 1 addition & 0 deletions instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ muzzle {
versions.set("[1.2,)")
// version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
skip("1.2.15")
assertInverse.set(true)
}
}

Expand Down
7 changes: 7 additions & 0 deletions ...o/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,26 @@

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

import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
import static java.util.Arrays.asList;

import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

@AutoService(InstrumentationModule.class)
public class Log4j1InstrumentationModule extends InstrumentationModule {
public Log4j1InstrumentationModule() {
super("log4j-mdc", "log4j-mdc-1.2");
}

@Override
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
return hasClassesNamed("org.apache.log4j.MDC");
}

@Override
public List<TypeInstrumentation> typeInstrumentations() {
return asList(new CategoryInstrumentation(), new LoggingEventInstrumentation());
Expand Down
Loading