Merge remote-tracking branch 'upstream/main' into more-pinning

# Conflicts:
#	.github/config/latest-dep-versions.json

Author: trask

.editorconfig

@@ -761,3 +761,7 @@ ij_properties_spaces_around_key_value_delimiter = false
 [{*.yaml, *.yml}]
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
+
+[*.md]
+# Markdown line length is handled by rumdl
+max_line_length = off

.fossa.yml

@@ -420,7 +420,7 @@ targets:
       target: ':instrumentation:cassandra:cassandra-4.4:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:clickhouse:clickhouse-client-common:javaagent'
+      target: ':instrumentation:clickhouse:clickhouse-client-common-0.5:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent'
@@ -513,7 +513,7 @@ targets:
       target: ':instrumentation:hibernate:hibernate-6.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:hibernate:hibernate-common:javaagent'
+      target: ':instrumentation:hibernate:hibernate-common-3.3:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:hibernate:hibernate-procedure-call-4.3:javaagent'
@@ -564,16 +564,16 @@ targets:
       target: ':instrumentation:jaxws:jaxws-2.0-axis2-1.6:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-common:javaagent'
+      target: ':instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-cxf-3.0:javaagent'
+      target: ':instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-jws-api-1.1:javaagent'
+      target: ':instrumentation:jaxws:jaxws-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxws:jaxws-metro-2.2:javaagent'
+      target: ':instrumentation:jaxws:jaxws-jws-api-1.1:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jboss-logmanager:jboss-logmanager-appender-1.1:javaagent'
@@ -591,7 +591,7 @@ targets:
       target: ':instrumentation:jedis:jedis-4.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jedis:jedis-common:javaagent'
+      target: ':instrumentation:jedis:jedis-common-1.4:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jetty:jetty-11.0:javaagent'
@@ -624,10 +624,10 @@ targets:
       target: ':instrumentation:jms:jms-3.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jms:jms-common:bootstrap'
+      target: ':instrumentation:jms:jms-common-1.1:bootstrap'
     - type: gradle
       path: ./
-      target: ':instrumentation:jms:jms-common:javaagent'
+      target: ':instrumentation:jms:jms-common-1.1:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-common-jakarta:javaagent'
@@ -882,7 +882,7 @@ targets:
       target: ':instrumentation:redisson:redisson-3.17:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:redisson:redisson-common:javaagent'
+      target: ':instrumentation:redisson:redisson-common-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:restlet:restlet-1.1:javaagent'
@@ -1131,7 +1131,7 @@ targets:
       target: ':instrumentation:play:play-ws:play-ws-2.1:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:play:play-ws:play-ws-common:javaagent'
+      target: ':instrumentation:play:play-ws:play-ws-common-1.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:reactor:reactor-netty:reactor-netty-0.9:javaagent'
@@ -1194,7 +1194,7 @@ targets:
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
+      target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
@@ -1203,7 +1203,7 @@ targets:
       target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common-4.0:javaagent'
 
 experimental:
   gradle:

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

@@ -15,7 +15,7 @@ Load only files relevant to the current scope to reduce noise and avoid over-con
 | `gradle-conventions.md` | `build.gradle.kts` or `settings.gradle.kts` changes, custom test task registration or wiring |
 | `javaagent-advice-patterns.md` | ByteBuddy `@Advice` class or advice-method changes |
 | `javaagent-module-patterns.md` | `InstrumentationModule`, `TypeInstrumentation`, `VirtualField`, `CallDepth` |
-| `javaagent-singletons-patterns.md` | `*Singletons` holder classes, singleton accessors, callers of singleton accessors/fields |
+| `javaagent-singletons-patterns.md` | `*Singletons`, `*SpanNaming`, and similar holder classes; singleton accessors; callers of singleton accessors/fields |
 | `library-patterns.md` | Library instrumentation telemetry, builder, getter, or setter pattern changes |
 | `module-naming.md` | New or renamed modules or packages; settings includes |
 | `testing-general-patterns.md` | Test files in scope — assertion style, test method signatures and throws clauses, resource cleanup patterns, attribute assertion patterns, `satisfies()` lambda usage |