Merge branch 'main' into test-latest-deps-helper

Author: trask

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

@@ -37,6 +37,11 @@
   wrapping when the lambda already needs its own error handling for behavioral reasons.
 - Do **not** choose `CompletableFuture.runAsync(...)` over the simpler
   `executor.submit(runnable).get()` just to avoid the checked exceptions thrown by `Future.get()`.
+- Do **not** wrap a call in `assertThatCode(() -> ...).doesNotThrowAnyException()`
+  solely to narrow a test method's `throws` clause by swallowing checked exceptions
+  into an `AssertionError`. If the call throws, the test already fails via its
+  `throws` clause. Prefer calling the method directly and leaving `throws Exception`
+  (or the narrowest checked type) on the `@Test` method.
 
 ## Test Resource Cleanup
 

.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

docs/instrumentation-list.yaml

@@ -15,7 +15,6 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -45,6 +44,7 @@ void setUp(@TempDir File esWorkingDir) {
             .put("discovery.type", "single-node")
             .build();
     testNode = getNodeFactory().newNode(settings);
+    cleanup.deferAfterAll(testNode);
     startNode(testNode);
 
     client = testNode.client();
@@ -75,11 +75,6 @@ void setUp(@TempDir File esWorkingDir) {
     testing.clearData();
   }
 
-  @AfterAll
-  void cleanUp() throws Exception {
-    testNode.close();
-  }
-
   protected abstract NodeFactory getNodeFactory();
 
   @Override

instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6NodeClientTest.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.node.Node;
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
@@ -46,6 +45,7 @@ void setUp(@TempDir File esWorkingDir) {
             .put("discovery.type", "single-node")
             .build();
     testNode = getNodeFactory().newNode(settings);
+    cleanup.deferAfterAll(testNode);
     startNode(testNode);
 
     tcpPublishAddress =
@@ -59,6 +59,7 @@ void setUp(@TempDir File esWorkingDir) {
                 .put("thread_pool.listener.size", 1)
                 .put(CLUSTER_NAME_SETTING.getKey(), clusterName)
                 .build());
+    cleanup.deferAfterAll(client);
     client.addTransportAddress(tcpPublishAddress);
     testing.runWithSpan(
         "setup",
@@ -88,12 +89,6 @@ void setUp(@TempDir File esWorkingDir) {
     testing.clearData();
   }
 
-  @AfterAll
-  void cleanUp() throws Exception {
-    client.close();
-    testNode.close();
-  }
-
   protected abstract NodeFactory getNodeFactory();
 
   @Override

instrumentation/elasticsearch/elasticsearch-transport-6.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v6_0/AbstractElasticsearch6TransportClientTest.java

@@ -22,6 +22,7 @@ public final class PropagatedContext {
 
   // Used by AtomicReferenceFieldUpdater
   @SuppressWarnings("UnusedVariable")
+  @Nullable
   private volatile Context context;
 
   PropagatedContext() {}

instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/PropagatedContext.java

@@ -32,7 +32,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("call").and(takesArguments(0)).and(isPublic()),
-        CallableInstrumentation.class.getName() + "$CallableAdvice");
+        getClass().getName() + "$CallableAdvice");
   }
 
   @SuppressWarnings("unused")

instrumentation/executors/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/executors/CallableInstrumentation.java

@@ -92,7 +92,7 @@ public boolean matches(TypeDescription target) {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("cancel").and(returns(boolean.class)),
-        FutureInstrumentation.class.getName() + "$CanceledFutureAdvice");
+        getClass().getName() + "$CanceledFutureAdvice");
   }
 
   @SuppressWarnings("unused")

instrumentation/executors/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/executors/FutureInstrumentation.java

@@ -53,45 +53,44 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("execute").and(takesArgument(0, Runnable.class)).and(takesArguments(1)),
-        JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
+        getClass().getName() + "$SetExecuteRunnableStateAdvice");
     // Netty uses addTask as the actual core of their submission; there are non-standard variations
     // like execute(Runnable,boolean) that aren't caught by standard instrumentation
     transformer.applyAdviceToMethod(
         named("addTask").and(takesArgument(0, Runnable.class)).and(takesArguments(1)),
-        JavaExecutorInstrumentation.class.getName() + "$SetExecuteRunnableStateAdvice");
+        getClass().getName() + "$SetExecuteRunnableStateAdvice");
     transformer.applyAdviceToMethod(
         named("execute").and(takesArgument(0, ForkJoinTask.class)),
-        JavaExecutorInstrumentation.class.getName() + "$SetJavaForkJoinStateAdvice");
+        getClass().getName() + "$SetJavaForkJoinStateAdvice");
     transformer.applyAdviceToMethod(
         named("submit")
             .and(takesArgument(0, Runnable.class))
             .and(returns(hasSuperType(is(Future.class)))),
-        JavaExecutorInstrumentation.class.getName() + "$SetSubmitRunnableStateAdvice");
+        getClass().getName() + "$SetSubmitRunnableStateAdvice");
     transformer.applyAdviceToMethod(
         named("submit")
             .and(takesArgument(0, Callable.class))
             .and(returns(hasSuperType(is(Future.class)))),
-        JavaExecutorInstrumentation.class.getName() + "$SetCallableStateAdvice");
+        getClass().getName() + "$SetCallableStateAdvice");
     transformer.applyAdviceToMethod(
         named("submit").and(takesArgument(0, ForkJoinTask.class)),
-        JavaExecutorInstrumentation.class.getName() + "$SetJavaForkJoinStateAdvice");
+        getClass().getName() + "$SetJavaForkJoinStateAdvice");
     transformer.applyAdviceToMethod(
         namedOneOf("invokeAny", "invokeAll").and(takesArgument(0, Collection.class)),
-        JavaExecutorInstrumentation.class.getName()
-            + "$SetCallableStateForCallableCollectionAdvice");
+        getClass().getName() + "$SetCallableStateForCallableCollectionAdvice");
     transformer.applyAdviceToMethod(
         named("invoke").and(takesArgument(0, ForkJoinTask.class)),
-        JavaExecutorInstrumentation.class.getName() + "$SetJavaForkJoinStateAdvice");
+        getClass().getName() + "$SetJavaForkJoinStateAdvice");
     transformer.applyAdviceToMethod(
         named("schedule")
             .and(takesArgument(0, Runnable.class))
             .and(returns(hasSuperType(is(Future.class)))),
-        JavaExecutorInstrumentation.class.getName() + "$SetSubmitRunnableStateAdvice");
+        getClass().getName() + "$SetSubmitRunnableStateAdvice");
     transformer.applyAdviceToMethod(
         named("schedule")
             .and(takesArgument(0, Callable.class))
             .and(returns(hasSuperType(is(Future.class)))),
-        JavaExecutorInstrumentation.class.getName() + "$SetCallableStateAdvice");
+        getClass().getName() + "$SetCallableStateAdvice");
   }
 
   @SuppressWarnings("unused")