Skip to content

Bump schema url versions for resource detectors - #3234

Open
jaydeluca wants to merge 1 commit into
open-telemetry:mainfrom
jaydeluca:bump-schema
Open

jaydeluca wants to merge 1 commit into
open-telemetry:mainfrom
jaydeluca:bump-schema

Conversation

@jaydeluca

Copy link
Copy Markdown
Member

Fixes this error in test logs:

Nov 19, 2026 8:34:38 PM io.opentelemetry.sdk.resources.Resource mergeSchemaUrl
INFO: Attempting to merge Resources with different schemaUrls. The resulting Resource will have no schemaUrl assigned. Schema 1: https://opentelemetry.io/schemas/1.40.0 Schema 2: https://opentelemetry.io/schemas/1.25.0

the attributes all exist in 1.40.0 so bumping them up to avoid losing the schema url

@jaydeluca
jaydeluca requested a review from a team as a code owner November 20, 2026 01:50
Copilot AI balanced review requested due to automatic review settings November 20, 2026 01:50

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No active review issues are reported for the AWS and Cloud Foundry schema-version alignment.

No open issues 🎉

What changed in this PR

Aligns AWS and Cloud Foundry resource detectors with schema version 1.40.0 to address the reported merge conflicts that drop resource schema URLs. Detected attributes remain unchanged.

Changes:

  • Updates AWS detector schema URLs from 1.25.0 to 1.40.0.
  • Updates the Cloud Foundry detector schema URL from 1.24.0 to 1.40.0.
  • Adjusts existing tests to expect the new schema version.
File Description
cloudfoundry-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​cloudfoundry/​resources/​CloudFoundryResourceTest.java Updates the Cloud Foundry schema assertion.
cloudfoundry-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​cloudfoundry/​resources/​CloudFoundryResource.java Sets the Cloud Foundry schema to 1.40.0.
aws-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​aws/​resource/​LambdaResourceTest.java Updates Lambda schema assertions.
aws-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​aws/​resource/​EksResourceTest.java Updates the EKS schema assertion.
aws-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​aws/​resource/​EcsResourceTest.java Updates ECS metadata V3 and V4 schema assertions.
aws-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​aws/​resource/​Ec2ResourceTest.java Updates EC2 IMDSv1 and IMDSv2 schema assertions.
aws-resources/​src/​test/​java/​io/​opentelemetry/​contrib/​aws/​resource/​BeanstalkResourceTest.java Updates the Beanstalk schema assertion.
aws-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​aws/​resource/​LambdaResource.java Sets the Lambda schema to 1.40.0.
aws-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​aws/​resource/​EksResource.java Sets the EKS schema to 1.40.0.
aws-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​aws/​resource/​EcsResource.java Sets the ECS schema to 1.40.0.
aws-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​aws/​resource/​Ec2Resource.java Sets the EC2 schema to 1.40.0.
aws-resources/​src/​main/​java/​io/​opentelemetry/​contrib/​aws/​resource/​BeanstalkResource.java Sets the schema to 1.40.0 in both resource-return paths.

Review effort: Balanced

@trask trask left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case something works here, we added a test in open-telemetry/opentelemetry-java-instrumentation#20917 to know when the SDK bumps the version next time.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants