Merge remote-tracking branch 'upstream/main' into isin

Author: trask

.github/agents/code-review-and-fix.agent.md

@@ -142,6 +142,8 @@ Auto-fix boundaries:
     lambdas where the lambda parameter is already an `AbstractAssert` (e.g.,
     `AbstractStringAssert`). Calls like `taskId.contains(jobName)` on the assert object are
     already valid AssertJ assertions; do not wrap them in `assertThat(...).isTrue()`
+  - AssertJ `.as(...)` descriptions and `.withFailMessage(...)` in tests — remove them
+    and prefer direct assertions whose failure output already exposes the unexpected values
   - deterministic semconv constant handling aligned with repository rules
   - missing test-task wiring patterns with clear canonical form
   - missing `testInstrumentation` cross-version references — when a javaagent module belongs

.github/agents/knowledge/testing-general-patterns.md

@@ -9,6 +9,8 @@
 
 - JUnit 5, AssertJ assertions (not JUnit `assertEquals`/`assertTrue`).
 - Test classes and methods should be package-private (no `public`).
+- Do not use AssertJ `.as(...)` descriptions or `.withFailMessage(...)` in tests.
+  Prefer direct assertions whose failure output shows the unexpected values.
 
 ## Test Resource Cleanup
 

instrumentation/c3p0-0.9/testing/src/main/java/io/opentelemetry/instrumentation/c3p0/AbstractC3p0InstrumentationTest.java

@@ -80,9 +80,7 @@ void shouldReportMetrics() throws Exception {
   private void assertDataSourceMetrics(PooledDataSource dataSource) {
     String dataSourceName = dataSource.getDataSourceName();
 
-    assertThat(dataSourceName)
-        .as("c3p0 generates a unique pool name if it's not explicitly provided")
-        .isNotEmpty();
+    assertThat(dataSourceName).isNotEmpty();
 
     DbConnectionPoolMetricsAssertions.create(
             testing(), INSTRUMENTATION_NAME, dataSource.getDataSourceName())

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9HttpCallTest.java

@@ -101,11 +101,7 @@ void inputStreamListenerBodyIsDelivered() throws Exception {
       body = buf.toByteArray();
     }
 
-    assertThat(body)
-        .as(
-            "Response body must not be empty — if it is, the OTel proxy is missing "
-                + "DemandedContentListener and Jetty filters it out before delivering content")
-        .isNotEmpty();
+    assertThat(body).isNotEmpty();
     assertThat(new String(body, UTF_8)).isEqualTo(EXPECTED_BODY);
   }
 }

instrumentation/jodd-http-4.2/javaagent/build.gradle.kts

@@ -6,13 +6,14 @@ muzzle {
   pass {
     group.set("org.jodd")
     module.set("jodd-http")
-    versions.set("[4.2.0,)")
+    versions.set("[4.1.1,)")
+    assertInverse.set(true)
   }
 }
 
 dependencies {
-  // 4.2 is the first version with java 8, follow-redirects and HttpRequest#headerOverwrite method
-  library("org.jodd:jodd-http:4.2.0")
+  // 4.1.1 is the first version with HttpBase#headerOverwrite used by header injection
+  library("org.jodd:jodd-http:4.1.1")
 
   testImplementation(project(":instrumentation:jodd-http-4.2:javaagent"))
   testImplementation(project(":instrumentation-api-incubator"))

instrumentation/jodd-http-4.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpSingletons.java

@@ -10,7 +10,7 @@
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 
-public final class JoddHttpSingletons {
+final class JoddHttpSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jodd-http-4.2";
 
   private static final Instrumenter<HttpRequest, HttpResponse> instrumenter;
@@ -21,7 +21,7 @@ public final class JoddHttpSingletons {
             INSTRUMENTATION_NAME, new JoddHttpHttpAttributesGetter(), new HttpHeaderSetter());
   }
 
-  public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
+  static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
     return instrumenter;
   }
 

instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java

@@ -24,8 +24,9 @@ public MojarraInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // javax.faces was renamed to jakarta.faces in JSF 3.0
-    return hasClassesNamed("javax.faces.context.FacesContext");
+    return hasClassesNamed(
+        // removed in 3.0
+        "javax.faces.context.FacesContext");
   }
 
   @Override

instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts

@@ -17,7 +17,7 @@ otelJava {
 }
 
 dependencies {
-  // can't use library for now because 6.1.0-M1 is latest and its POM referes to a missing parent POM
+  // can't use library for now because 6.1.0-M1 is latest and its POM refers to a missing parent POM
   // switch back to library when a new version is released
   // library("jakarta.el:jakarta.el-api:4.0.0")
   compileOnly("jakarta.el:jakarta.el-api:4.0.0")

instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraInstrumentationModule.java

@@ -16,16 +16,17 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class MojarraInstrumentationModule extends InstrumentationModule
+public final class MojarraInstrumentationModule extends InstrumentationModule
     implements ExperimentalInstrumentationModule {
   public MojarraInstrumentationModule() {
     super("jsf-mojarra", "jsf-mojarra-3.0");
   }
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // jakarta.faces was introduced in JSF 3.0, replacing javax.faces
-    return hasClassesNamed("jakarta.faces.context.FacesContext");
+    return hasClassesNamed(
+        // added in 3.0
+        "jakarta.faces.context.FacesContext");
   }
 
   @Override

instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraSingletons.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfErrorCauseExtractor;
 import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
 
-public class MojarraSingletons {
+public final class MojarraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-mojarra-3.0";
 
   private static final Instrumenter<JsfRequest, Void> instrumenter;