Repository navigation
Conversation
Pull request dashboard statusWaiting on reviewers · refreshed 2026-10-23 23:19 UTC Review the latest changes. Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix Java agent 2.33.0 startup resource-schema conflict for 2.33.1
Fix resource schema conflict for 2.33.1 on maintenance/v2.x
Oct 23, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The narrowly scoped schema correction preserves detector behavior and includes focused regression coverage, with no blocking issues identified.
No open issues 🎉
What changed in this PR
This PR fixes the 2.33.1 resource-schema conflict by aligning the four built-in resource detectors with SDK 1.67.0’s schema, without changing detector attributes or configuration behavior.
Changes:
- Update host, OS, process, and process-runtime schema metadata and assertions from
1.24.0to1.40.0. - Add autoconfiguration regression coverage for both service-name configuration paths, checking attribute preservation and absence of schema-conflict warnings.
- Add test dependencies for autoconfiguration and log capture; disable exporters and close constructed SDKs.
| File | Description |
|---|---|
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ResourceProviderRegistrationTest.java | Verify resource merging for both service-name settings. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java | Expect runtime schema 1.40.0. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java | Expect process schema 1.40.0. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java | Expect schema 1.40.0 across OS cases. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java | Expect host schema 1.40.0. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java | Align runtime resource schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java | Align process resource schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java | Align OS resource schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java | Align host resource schema. |
| instrumentation/resources/library/build.gradle.kts | Add autoconfiguration and log-capture test dependencies. |
Review effort: Balanced
trask
changed the title
trask
marked this pull request as ready for review
October 23, 2026 21:40
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
steffan-westcott
added a commit
to steffan-westcott/clj-otel
that referenced
this pull request
Oct 24, 2026
- Bump OpenTelemetry deps to 1.67.0 - Bump OpenTelemetry instrumentation deps to 2.33.0 Note: There is a known issue in OpenTelemetry Java concerning schemaUrl mismatches affecting the service name resource when using the instrumentation agent. This will be addressed in later releases of OpenTelemetry Java. See open-telemetry/opentelemetry-java-instrumentation#20915
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix startup schema-conflict messages in Java agent 2.33.0 when a service name is configured.
Align the built-in host, OS, process, and process-runtime resources with the SDK's schema
1.40.0. Resource attribute names, values, and detection behavior are unchanged.