Repository navigation
Align built-in resource schemas with SDK 1.67.0 - #20917
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-26 06:41 UTC Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix built-in resource schema conflicts introduced by SDK 1.67.0
Align built-in resource schemas with SDK 1.67.0
Oct 23, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The narrowly scoped schema updates preserve detector behavior, and the added regression coverage addresses both service-name configuration paths with no unresolved blocking findings.
No open issues 🎉
What changed in this PR
Aligns built-in resource schema URLs with SDK 1.67.0 so merging detector resources with configured service resources preserves schema 1.40.0.
Changes:
- Updates host, OS, process, and process-runtime fallback schemas without changing entity behavior or command-attribute opt-in.
- Adds auto-configuration regression coverage for both service-name configuration forms, checking retained attributes, schema URL, and absence of conflict logs.
- Updates detector assertions and adds test dependencies.
| File | Description |
|---|---|
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ResourceProviderRegistrationTest.java | Adds service-resource merge regression coverage. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java | Updates the fallback schema assertion. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java | Expects process schema 1.40.0. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java | Expects schema 1.40.0 across OS cases. |
| instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java | Expects host schema 1.40.0. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java | Aligns the missing-property fallback schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java | Aligns the process resource schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java | Aligns the OS resource schema. |
| instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java | Aligns the host resource schema. |
| instrumentation/resources/library/build.gradle.kts | Adds log-capture and auto-configuration test dependencies. |
Review effort: Balanced
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
approved these changes
Oct 23, 2026
laurit
approved these changes
Oct 26, 2026
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.
SDK 1.67.0 produces service resources with schema 1.40.0, while built-in host, OS, and process resources used 1.24.0, causing merges to drop the schema URL.
otel.service.name=configured-serviceorotel.resource.attributes=service.name=configured-service.