Merge branch 'main' into otelbot/code-review-sweep-24966697425

Author: trask

.github/scripts/rerun-flaky-pr-jobs.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 
 LOOKBACK_HOURS = 2
-MAX_FAILED_JOBS_PER_WORKFLOW_RUN = 2
+MAX_FAILED_JOBS_PER_WORKFLOW_RUN = 5
 MAX_RERUN_ATTEMPTS = 2
 
 
@@ -36,7 +36,7 @@ def main() -> None:
             continue
 
         rerun_attempts = run["run_attempt"] - 1
-        if rerun_attempts > MAX_RERUN_ATTEMPTS:
+        if rerun_attempts >= MAX_RERUN_ATTEMPTS:
             processed_runs.append(
                 f"Skipped {format_run(run)}: already rerun {rerun_attempts} times."
             )

.github/workflows/code-review-sweep.yml

@@ -25,6 +25,7 @@ jobs:
     outputs:
       modules: ${{ steps.build-matrix.outputs.modules }}
       has_work: ${{ steps.build-matrix.outputs.has_work }}
+      model: ${{ steps.model.outputs.model }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -33,6 +34,12 @@ jobs:
       - name: Fetch progress branch
         run: git fetch origin otelbot/code-review-progress || true
 
+      - name: Resolve Copilot model
+        id: model
+        run: |
+          model=$(git show origin/otelbot/code-review-progress:model.txt | xargs)
+          echo "model=$model" >> "$GITHUB_OUTPUT"
+
       - name: Build review matrix
         id: build-matrix
         env:
@@ -58,7 +65,7 @@ jobs:
       contents: write  # for git push
     env:
       MODULES_JSON: ${{ needs.dispatch.outputs.modules }}
-      MODEL: "gpt-5.4"
+      MODEL: ${{ needs.dispatch.outputs.model }}
       # Stop processing further modules once at least this many files have been
       # modified (vs origin/main) at the end of a module.
       FILE_THRESHOLD: 10

instrumentation/gwt-2.0/javaagent/build.gradle.kts

@@ -23,9 +23,6 @@ sourceSets {
     java {
       destinationDirectory.set(layout.buildDirectory.dir("testapp/classes"))
     }
-    resources {
-      srcDirs("src/webapp")
-    }
     compileClasspath = compileClasspath.plus(sourceSets.main.get().compileClasspath)
   }
 }

instrumentation/helidon-4.3/testing/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/AbstractHelidonTest.java

@@ -30,15 +30,15 @@ public abstract class AbstractHelidonTest extends AbstractHttpServerTest<WebServ
 
   protected void configureRoutes(HttpRouting.Builder routing) {}
 
-  static void sendResponse(ServerResponse res, int status, String response) {
+  private static void sendResponse(ServerResponse res, int status, String response) {
     sendResponse(res, status, emptyMap(), response);
   }
 
-  static void sendResponse(ServerResponse res, int status, Map<String, String> headers) {
+  private static void sendResponse(ServerResponse res, int status, Map<String, String> headers) {
     sendResponse(res, status, headers, "");
   }
 
-  static void sendResponse(
+  private static void sendResponse(
       ServerResponse res, int status, Map<String, String> headers, String response) {
     res.header("Content-Type", "text/plain");
     headers.forEach(res::header);

instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java

@@ -575,7 +575,7 @@ private static class Parameter {
     }
   }
 
-  static void sessionAssertion(TraceAssert trace, String methodName, String resource) {
+  private static void sessionAssertion(TraceAssert trace, String methodName, String resource) {
     trace.hasSpansSatisfyingExactly(
         span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
         span -> assertSessionSpan(span, trace.getSpan(0), "Session." + methodName + " " + resource),

instrumentation/hibernate/hibernate-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityNameUtil.java

@@ -12,7 +12,9 @@
 
 public class EntityNameUtil {
 
-  private EntityNameUtil() {}
+  public static Function<Object, String> bestGuessEntityName(SharedSessionContract session) {
+    return entity -> bestGuessEntityName(session, entity);
+  }
 
   private static String bestGuessEntityName(SharedSessionContract session, Object entity) {
     if (entity == null) {
@@ -28,7 +30,5 @@ private static String bestGuessEntityName(SharedSessionContract session, Object
     return null;
   }
 
-  public static Function<Object, String> bestGuessEntityName(SharedSessionContract session) {
-    return (entity) -> bestGuessEntityName(session, entity);
-  }
+  private EntityNameUtil() {}
 }

instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java

@@ -50,7 +50,7 @@
 
 class EntityManagerTest extends AbstractHibernateTest {
 
-  static final EntityManagerFactory entityManagerFactory =
+  private static final EntityManagerFactory entityManagerFactory =
       Persistence.createEntityManagerFactory("test-pu");
 
   @AfterAll

instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java

@@ -39,9 +39,9 @@ class SpringJpaTest {
   @RegisterExtension
   protected static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  AnnotationConfigApplicationContext context =
+  private final AnnotationConfigApplicationContext context =
       new AnnotationConfigApplicationContext(PersistenceConfig.class);
-  CustomerRepository repo = context.getBean(CustomerRepository.class);
+  private final CustomerRepository repo = context.getBean(CustomerRepository.class);
 
   @AfterEach
   void closeContext() {

instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/HibernateInstrumentationModule.java

@@ -25,9 +25,8 @@ public HibernateInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed(
-        // added in 6.0
-        "org.hibernate.query.spi.SqmQuery");
+    // added in 6.0
+    return hasClassesNamed("org.hibernate.query.spi.SqmQuery");
   }
 
   @Override

instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionInstrumentation.java

@@ -82,8 +82,7 @@ public void transform(TypeTransformer transformer) {
         getClass().getName() + "$GetTransactionAdvice");
 
     transformer.applyAdviceToMethod(
-        returns(implementsInterface(named("org.hibernate.query.CommonQueryContract")))
-            .or(named("org.hibernate.query.spi.QueryImplementor")),
+        returns(implementsInterface(named("org.hibernate.query.CommonQueryContract"))),
         getClass().getName() + "$GetQueryAdvice");
   }