Merge origin/main into fea/genai-otel-1.37.0

Resolve conflicts:
- SemconvStability.java: Integrate GenAI semconv into declarative config architecture
- aws-sdk-2.2 build.gradle.kts: Keep GenAI opt-in JVM arg for bedrock tests
- openai-java-1.1 build.gradle.kts: Adopt otelProps pattern, keep GenAI config
- OpenAITelemetryBuilder.java: Keep ChatAttributesGetter.INSTANCE and captureMessageContent
- AbstractChatTest.java: Keep extracted variable pattern for span assertions

Author: steverao

.fossa.yml

@@ -178,9 +178,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:java-util-logging:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:jaxrs-client:jaxrs-client-1.1-testing'
     - type: gradle
       path: ./
       target: ':instrumentation:jdbc:bootstrap'
@@ -349,9 +346,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:armeria:armeria-grpc-1.14:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:async-http-client:async-http-client-1-common:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:async-http-client:async-http-client-1.8:javaagent'
@@ -361,6 +355,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:async-http-client:async-http-client-2.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:async-http-client:async-http-client-common-1.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:aws-lambda:aws-lambda-core-1.0:javaagent'
@@ -430,9 +427,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:clickhouse:clickhouse-client-v2-0.8:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:couchbase:couchbase-2-common:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:couchbase:couchbase-2.0:javaagent'
@@ -451,6 +445,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:couchbase:couchbase-3.4:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:couchbase:couchbase-common-2.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent'
@@ -633,10 +630,10 @@ targets:
       target: ':instrumentation:jms:jms-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
+      target: ':instrumentation:jsf:jsf-common-javax:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-javax-common:javaagent'
+      target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-mojarra-1.2:javaagent'
@@ -838,9 +835,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.56:javaagent'
@@ -913,15 +907,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:library'
     - type: gradle
       path: ./
       target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:library'
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-1.0:library'
@@ -1098,7 +1086,7 @@ targets:
       target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent'
+      target: ':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jaxrs:jaxrs-3.0:jaxrs-3.0-annotations:javaagent'
@@ -1174,9 +1162,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-jms:spring-jms-6.0:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:spring:spring-web:spring-web-3.1:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:spring:spring-web:spring-web-3.1:library'

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

@@ -91,7 +91,16 @@ For each file in scope:
    - PR mode: changed lines only
    - File/directory mode: all lines
 4. Apply checklist rules (below) and insert comments above offending lines.
-5. Prevent duplicates:
+5. Do not flag a non-capturing lambda or method reference as an allocation issue.
+   On HotSpot / OpenJDK 8+, these are cached at the call site.
+6. Flag a missing version-boundary comment on a single-class `hasClassesNamed(...)`
+   check in `classLoaderMatcher()` only after validating the stated boundary from
+   repository or upstream evidence. Use `// added in X.Y` for a pure lower bound.
+   If the same positive class also provides the upper bound because it disappears in a
+   newer sibling version, preserve or request `removed in Y.Z` too. For negated checks
+   such as `not(hasClassesNamed(...))`, use `// added in Y.Z` because the class's first
+   appearance is what starts the excluded version range.
+7. Prevent duplicates:
    - If equivalent `REVIEW:` already exists above the same line, do not add another.
 
 Comment formatting rules:

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

@@ -0,0 +1,122 @@
+---
+description: "Draft changelog entries for an upcoming release by running the draft-change-log-entries.sh script, then curating and inserting the results into CHANGELOG.md."
+tools: [read, edit, execute, search]
+---
+
+You are a release-notes drafting agent for the `opentelemetry-java-instrumentation` repository.
+
+Primary responsibilities:
+
+- Generate draft changelog entries by running the existing shell script.
+- Curate, categorize, and deduplicate entries.
+- Update `CHANGELOG.md` with the final entries under the `## Unreleased` section.
+
+Do not stop until the changelog is updated and a summary is shown.
+
+## Workflow
+
+### Phase 1: Gather Raw Entries
+
+1. Determine the current version:
+
+   ```bash
+   .github/scripts/get-version.sh
+   ```
+
+2. Run the draft script to generate raw entries:
+
+   ```bash
+   bash .github/scripts/draft-change-log-entries.sh
+   ```
+
+   This script:
+   - Computes the git range since the last release tag.
+   - Queries GitHub for PRs with `breaking change` and `deprecation` labels.
+   - Scans commits for `@Deprecated` additions/removals.
+   - Groups commits by whether they touch `src/main/` files.
+   - Outputs a markdown skeleton with categorized sections.
+
+3. Capture the full output. If the script fails (e.g., `gh` CLI not authenticated),
+   report the error and stop.
+
+### Phase 2: Read Prior Changelog Format
+
+1. Read the top of `CHANGELOG.md` to understand the current `## Unreleased` section
+   and the format of the most recent versioned release.
+2. Note the section ordering used in prior releases. The standard order is:
+
+   - `### ⚠️ Breaking changes to non-stable APIs` (from labeled PRs and @Deprecated removals)
+   - `### 🚫 Deprecations` (from labeled PRs and @Deprecated additions)
+   - `### 🌟 New javaagent instrumentation`
+   - `### 🌟 New library instrumentation`
+   - `### 📈 Enhancements`
+   - `### 🛠️ Bug fixes`
+   - `### 🧰 Tooling`
+
+### Phase 3: Curate Entries
+
+Using the raw output from Phase 1, build the changelog body:
+
+1. **Breaking changes**: Take entries from the "Breaking Changes" labeled-PR section
+   and from the "Possible breaking changes (diff removes @Deprecated)" section.
+   Deduplicate by PR number.
+
+2. **Deprecations**: Take entries from the "Deprecations" labeled-PR section
+   and from the "Possible deprecations (diff adds @Deprecated)" section.
+   Deduplicate by PR number.
+
+3. **Categorize remaining commits**: For each commit in "Changes with src/main updates"
+   that was not already placed in breaking changes or deprecations, classify it into
+   one of these sections based on its commit message and changed files:
+   - **New javaagent instrumentation**: commits that add a new instrumentation module
+     (new directories under `instrumentation/`).
+   - **New library instrumentation**: commits that add new library instrumentation modules.
+   - **Enhancements**: feature additions, improvements, refactors to existing instrumentation.
+   - **Bug fixes**: commits whose message contains "fix", "bug", "regression", "correct",
+     or similar keywords.
+   - **Tooling**: changes to build scripts, CI, testing infrastructure, or tooling.
+
+4. **Omit non-user-facing changes**: Commits in "Changes without src/main updates"
+   are typically CI, docs, or dependency updates. Exclude them from the changelog
+   unless they are clearly user-facing (e.g., documentation that ships with the release).
+
+5. Format each entry as:
+
+   ```
+   - Short description of the change
+     ([#NNNN](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/NNNN))
+   ```
+
+   When multiple PRs relate to the same logical change, group them:
+
+   ```
+   - Short description of the change
+     ([#AAAA](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/AAAA),
+      [#BBBB](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/BBBB))
+   ```
+
+6. Omit empty sections entirely.
+
+### Phase 4: Update CHANGELOG.md
+
+1. Read `CHANGELOG.md`.
+2. Locate the `## Unreleased` section (everything between `## Unreleased` and the
+   next `## Version` heading).
+3. Replace the content of the `## Unreleased` section with the curated entries,
+   preserving a blank line after `## Unreleased` and before the next `## Version`.
+4. Write the updated file.
+5. Show a confirmation message:
+
+   > ✅ Updated CHANGELOG.md with draft entries for version `<version>`.
+   > Run `git diff CHANGELOG.md` to review the changes.
+
+## Rules
+
+- Never remove or modify existing versioned release sections in `CHANGELOG.md`.
+- Only modify the `## Unreleased` section.
+- Preserve the exact heading format (`## Unreleased`) — do not add a date or version number.
+  The version heading is set later during the release process.
+- Use the same markdown formatting conventions as prior releases in the file.
+- If `gh` CLI is unavailable or not authenticated, fall back to git-only analysis
+  (skip labeled-PR extraction) and warn the user that breaking-change and deprecation
+  labels could not be checked.

.github/agents/draft-release-notes.agent.md

@@ -11,11 +11,14 @@ Load only files relevant to the current scope to reduce noise and avoid over-con
 | `api-deprecation-policy.md` | Public API removal, rename, or deprecation; stable vs alpha breaking changes |
 | `config-property-stability.md` | `otel.instrumentation.*` property add, remove, rename, or deprecation |
 | `general-rules.md` | Always — review checklist table and core rules enforced on every review |
+| `metadata-yaml-format.md` | Always — mandatory review of metadata.yaml for config coverage |
 | `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`, `Singletons`, `VirtualField`, `CallDepth` |
+| `javaagent-module-patterns.md` | `InstrumentationModule`, `TypeInstrumentation`, `VirtualField`, `CallDepth` |
+| `javaagent-singletons-patterns.md` | `*Singletons` 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 |
 | `testing-experimental-flags.md` | `testExperimental` task or experimental span-attribute assertions |
 | `testing-semconv-stability.md` | Semconv opt-in modes, `emitOld*`/`emitStable*`, `maybeStable`, Semconv test tasks |
 

.github/agents/knowledge/README.md

@@ -18,6 +18,15 @@ The CHANGELOG uses distinct headings to distinguish:
 - `⚠️ Breaking changes to non-stable APIs` — alpha/non-stable modules (routine)
 - `⚠️ Breaking Changes` — stable module changes (rare, requires strong justification)
 
+### Javaagent modules are not a public API
+
+Javaagent modules (Gradle path ends with `:javaagent`, including shared `-common` javaagent
+modules) are bundled into the agent jar and are **not** published for external consumption.
+Do **not** apply a deprecation cycle to symbols in javaagent modules — rename or change the
+API directly and update all in-repo callers in the same commit. The deprecate-then-remove
+cycle described below applies only to non-stable modules whose artifacts are published
+(e.g., `:library`, `:testing`, `instrumentation-api*`).
+
 ## The Deprecate-Then-Remove Cycle
 
 ### Alpha (non-stable) modules

.github/agents/knowledge/api-deprecation-policy.md

@@ -52,7 +52,7 @@ Defined in [VERSIONING.md](../../../VERSIONING.md):
 Examples (flat ↔ YAML):
 
 - `otel.instrumentation.http.client.capture-request-headers` ↔ `request_captured_headers` — **stable**
-- `otel.instrumentation.common.experimental.db-sqlcommenter.enabled` ↔ `sqlcommenter/development: { enabled: true }` — **experimental**
+- `otel.instrumentation.common.db.experimental.sqlcommenter.enabled` ↔ `sqlcommenter/development: { enabled: true }` — **experimental**
 - `otel.instrumentation.http.client.emit-experimental-telemetry` ↔ `emit_experimental_telemetry/development: true` — **experimental**
 
 ## Deprecation Communication