Merge branch 'main' into initializer

Author: trask

.github/agents/knowledge/gradle-conventions.md

@@ -264,5 +264,8 @@ When already present, verify:
 - `collectMetadata` is in `withType<Test>().configureEach` (or `tasks.test` if the module
   does not explicitly register additional `Test` tasks — `latestDepTest` does not count) —
   never on individual tasks.
-- `metadataConfig` is on each non-default task, not on the default `test` task.
+- `metadataConfig` is on each non-default task. It may also appear on the default `test`
+  task when that task itself runs with non-default `jvmArgs` (e.g., an experimental flag
+  enabled module-wide via `withType<Test>().configureEach { jvmArgs(...) }`); in that case
+  the `metadataConfig` value should describe those non-default jvmArgs.
 - The `metadataConfig` value matches at least one of the jvmArgs configured in the task

.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/config/latest-dep-versions.json

@@ -45,7 +45,7 @@
     "com.google.guava:guava#+": "33.6.0-jre",
     "com.google.gwt:gwt-servlet#+": "2.10.0",
     "com.google.http-client:google-http-client#+": "2.1.0",
-    "com.graphql-java:graphql-java#+": "25.0",
+    "com.graphql-java:graphql-java#+": "26.0",
     "com.graphql-java:graphql-java#19.+": "19.11",
     "com.h2database:h2#+": "2.4.240",
     "com.jfinal:jetty-server#+": "2019.3",
@@ -54,7 +54,7 @@
     "com.linecorp.armeria:armeria-grpc#+": "1.38.0",
     "com.linecorp.armeria:armeria-junit5#+": "1.38.0",
     "com.lmax:disruptor#+": "4.0.0",
-    "com.mchange:c3p0#+": "0.12.0",
+    "com.mchange:c3p0#+": "0.13.0",
     "com.netflix.hystrix:hystrix-core#+": "1.5.18",
     "com.ning:async-http-client#+": "1.9.40",
     "com.ning:async-http-client#1.8.+": "1.8.17",
@@ -119,18 +119,18 @@
     "commons-httpclient:commons-httpclient#+": "3.1",
     "commons-httpclient:commons-httpclient#3.+": "3.1",
     "dev.failsafe:failsafe#+": "3.3.2",
-    "dev.zio:zio-http_2.12#+": "3.10.1",
-    "dev.zio:zio-http_2.13#+": "3.10.1",
-    "dev.zio:zio-http_3#+": "3.10.1",
+    "dev.zio:zio-http_2.12#+": "3.11.0",
+    "dev.zio:zio-http_2.13#+": "3.11.0",
+    "dev.zio:zio-http_3#+": "3.11.0",
     "dev.zio:zio_2.12#+": "2.1.25",
     "dev.zio:zio_2.13#+": "2.1.25",
     "dev.zio:zio_3#+": "2.1.25",
     "fish.payara.extras:payara-embedded-web#+": "7.2026.4",
     "io.activej:activej-http#+": "5.5",
     "io.activej:activej-http#6.+": "6.0-rc2",
     "io.avaje:avaje-jex#+": "3.5",
-    "io.awspring.cloud:spring-cloud-aws-sqs#+": "4.0.0",
-    "io.awspring.cloud:spring-cloud-aws-starter-sqs#+": "4.0.0",
+    "io.awspring.cloud:spring-cloud-aws-sqs#+": "4.0.1",
+    "io.awspring.cloud:spring-cloud-aws-starter-sqs#+": "4.0.1",
     "io.dropwizard.metrics:metrics-core#+": "4.2.38",
     "io.dropwizard:dropwizard-client#+": "5.0.1",
     "io.dropwizard:dropwizard-views#+": "5.0.1",
@@ -257,7 +257,7 @@
     "org.apache.axis2:axis2-transport-local#1.+": "1.8.2",
     "org.apache.camel:camel-aws#2.+": "2.25.4",
     "org.apache.camel:camel-cassandraql#2.+": "2.25.4",
-    "org.apache.camel:camel-core#+": "4.19.0",
+    "org.apache.camel:camel-core#+": "4.20.0",
     "org.apache.camel:camel-core#2.+": "2.25.4",
     "org.apache.camel:camel-http-starter#2.+": "2.25.4",
     "org.apache.camel:camel-jaxb-starter#2.+": "2.25.4",
@@ -435,51 +435,51 @@
     "org.springframework.amqp:spring-rabbit#+": "4.0.3",
     "org.springframework.batch:spring-batch-core#+": "6.0.3",
     "org.springframework.batch:spring-batch-core#4.+": "4.3.10",
-    "org.springframework.boot:spring-boot#+": "4.0.5",
+    "org.springframework.boot:spring-boot#+": "4.0.6",
     "org.springframework.boot:spring-boot#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-actuator-autoconfigure#+": "4.0.5",
+    "org.springframework.boot:spring-boot-actuator-autoconfigure#+": "4.0.6",
     "org.springframework.boot:spring-boot-autoconfigure#+": "2.7.18",
     "org.springframework.boot:spring-boot-autoconfigure#2.+": "2.7.18",
     "org.springframework.boot:spring-boot-dependencies#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-dependencies#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-dependencies#4.+": "4.0.5",
-    "org.springframework.boot:spring-boot-restclient#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter#+": "4.0.5",
+    "org.springframework.boot:spring-boot-dependencies#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-dependencies#4.+": "4.0.6",
+    "org.springframework.boot:spring-boot-restclient#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter#+": "4.0.6",
     "org.springframework.boot:spring-boot-starter#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-starter#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-actuator#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-actuator#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-amqp#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-aop#+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-data-jdbc#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-data-mongodb#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-data-r2dbc#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-data-r2dbc#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-jdbc#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-jdbc#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-kafka#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-micrometer-metrics#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-pulsar#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-reactor-netty#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-reactor-netty#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-starter-security#+": "4.0.5",
+    "org.springframework.boot:spring-boot-starter#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-actuator#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-actuator#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-amqp#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-aop#+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-data-jdbc#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-data-mongodb#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-data-r2dbc#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-data-r2dbc#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-jdbc#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-jdbc#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-kafka#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-micrometer-metrics#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-pulsar#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-reactor-netty#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-reactor-netty#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-starter-security#+": "4.0.6",
     "org.springframework.boot:spring-boot-starter-security#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-starter-test#+": "4.0.5",
+    "org.springframework.boot:spring-boot-starter-test#+": "4.0.6",
     "org.springframework.boot:spring-boot-starter-test#2.+": "2.7.18",
     "org.springframework.boot:spring-boot-starter-test#2.1.+": "2.1.18.RELEASE",
-    "org.springframework.boot:spring-boot-starter-test#3.+": "3.5.13",
+    "org.springframework.boot:spring-boot-starter-test#3.+": "3.5.14",
     "org.springframework.boot:spring-boot-starter-test#3.3.+": "3.3.13",
     "org.springframework.boot:spring-boot-starter-tomcat#+": "2.7.18",
     "org.springframework.boot:spring-boot-starter-tomcat#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-starter-web#+": "4.0.5",
+    "org.springframework.boot:spring-boot-starter-web#+": "4.0.6",
     "org.springframework.boot:spring-boot-starter-web#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-starter-web#3.+": "3.5.13",
+    "org.springframework.boot:spring-boot-starter-web#3.+": "3.5.14",
     "org.springframework.boot:spring-boot-starter-web-services#+": "2.7.18",
     "org.springframework.boot:spring-boot-starter-web-services#2.+": "2.7.18",
-    "org.springframework.boot:spring-boot-starter-webflux#+": "4.0.5",
-    "org.springframework.boot:spring-boot-starter-webflux#3.+": "3.5.13",
-    "org.springframework.boot:spring-boot-webclient#+": "4.0.5",
-    "org.springframework.boot:spring-boot-webflux#+": "4.0.5",
+    "org.springframework.boot:spring-boot-starter-webflux#+": "4.0.6",
+    "org.springframework.boot:spring-boot-starter-webflux#3.+": "3.5.14",
+    "org.springframework.boot:spring-boot-webclient#+": "4.0.6",
+    "org.springframework.boot:spring-boot-webflux#+": "4.0.6",
     "org.springframework.cloud:spring-cloud-starter-gateway#+": "4.3.4",
     "org.springframework.cloud:spring-cloud-starter-gateway#2.1.+": "2.1.5.RELEASE",
     "org.springframework.cloud:spring-cloud-starter-gateway-server-webflux#+": "5.0.1",
@@ -527,20 +527,20 @@
     "redis.clients:jedis#2.+": "2.10.2",
     "redis.clients:jedis#3.+": "3.10.0",
     "software.amazon.awssdk.crt:aws-crt#+": "0.45.1",
-    "software.amazon.awssdk:aws-core#+": "2.42.38",
-    "software.amazon.awssdk:aws-json-protocol#+": "2.42.38",
-    "software.amazon.awssdk:bedrockruntime#+": "2.42.38",
-    "software.amazon.awssdk:dynamodb#+": "2.42.38",
-    "software.amazon.awssdk:ec2#+": "2.42.38",
-    "software.amazon.awssdk:kinesis#+": "2.42.38",
-    "software.amazon.awssdk:lambda#+": "2.42.38",
-    "software.amazon.awssdk:rds#+": "2.42.38",
-    "software.amazon.awssdk:s3#+": "2.42.38",
-    "software.amazon.awssdk:secretsmanager#+": "2.42.38",
-    "software.amazon.awssdk:ses#+": "2.42.38",
-    "software.amazon.awssdk:sfn#+": "2.42.38",
-    "software.amazon.awssdk:sns#+": "2.42.38",
-    "software.amazon.awssdk:sqs#+": "2.42.38",
+    "software.amazon.awssdk:aws-core#+": "2.42.41",
+    "software.amazon.awssdk:aws-json-protocol#+": "2.42.41",
+    "software.amazon.awssdk:bedrockruntime#+": "2.42.41",
+    "software.amazon.awssdk:dynamodb#+": "2.42.41",
+    "software.amazon.awssdk:ec2#+": "2.42.41",
+    "software.amazon.awssdk:kinesis#+": "2.42.41",
+    "software.amazon.awssdk:lambda#+": "2.42.41",
+    "software.amazon.awssdk:rds#+": "2.42.41",
+    "software.amazon.awssdk:s3#+": "2.42.41",
+    "software.amazon.awssdk:secretsmanager#+": "2.42.41",
+    "software.amazon.awssdk:ses#+": "2.42.41",
+    "software.amazon.awssdk:sfn#+": "2.42.41",
+    "software.amazon.awssdk:sns#+": "2.42.41",
+    "software.amazon.awssdk:sqs#+": "2.42.41",
     "tech.powerjob:powerjob-official-processors#+": "5.1.2",
     "tech.powerjob:powerjob-worker#+": "5.1.2"
 }

.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

conventions/src/main/kotlin/otel.animalsniffer-conventions.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-  add("signature", "com.toasttab.android:gummy-bears-api-23:0.13.0:coreLib@signature")
+  add("signature", "com.toasttab.android:gummy-bears-api-23:0.14.0:coreLib2@signature")
 }
 
 animalsniffer {