Skip to content

add missing declarative config resource providers#14222

Merged
trask merged 29 commits intoopen-telemetry:mainfrom
zeitlinger:declarative-config-resource-providers
Sep 11, 2025
Merged

add missing declarative config resource providers#14222
trask merged 29 commits intoopen-telemetry:mainfrom
zeitlinger:declarative-config-resource-providers

Conversation

@zeitlinger
Copy link
Copy Markdown
Member

@zeitlinger zeitlinger commented Jul 10, 2025 •
edited
Loading

Fixes #14081

@zeitlinger zeitlinger self-assigned this Jul 10, 2025
@zeitlinger zeitlinger requested a review from a team as a code owner July 10, 2025 14:37
@zeitlinger zeitlinger mentioned this pull request Jul 10, 2025
Closed
@zeitlinger zeitlinger marked this pull request as draft July 11, 2025 07:07
@zeitlinger zeitlinger force-pushed the declarative-config-resource-providers branch from f5600d0 to 6728f62 Compare July 15, 2025 15:22
@zeitlinger zeitlinger marked this pull request as ready for review July 15, 2025 16:09
@zeitlinger zeitlinger moved this from In Progress to Awaiting Review in Declarative Configuration: Java Jul 15, 2025
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jul 16, 2025

@laurit please have a look 😄

laurit
laurit reviewed Jul 16, 2025
View reviewed changes
Comment thread ...rary/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java Outdated
Comment thread ...library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java Outdated
Comment thread instrumentation/resources/library/build.gradle.kts Outdated
Comment thread ...g/src/main/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProvider.java Outdated
jaydeluca
jaydeluca reviewed Jul 16, 2025
View reviewed changes
Comment thread ...a/io/opentelemetry/instrumentation/resources/internal/ManifestResourceComponentProvider.java Outdated
Comment thread ...n/java/io/opentelemetry/instrumentation/resources/internal/JarResourceComponentProvider.java Outdated
Comment thread .../java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java Outdated
@zeitlinger zeitlinger mentioned this pull request Jul 17, 2025
Merged
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Jul 18, 2025

@laurit can you check again?

@zeitlinger zeitlinger force-pushed the declarative-config-resource-providers branch from f283f17 to e99c20a Compare July 22, 2025 08:08
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Aug 4, 2025

@laurit can you check again?

1 similar comment
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Aug 15, 2025

@laurit can you check again?

@zeitlinger zeitlinger force-pushed the declarative-config-resource-providers branch 2 times, most recently from 78f8138 to 2a610ea Compare August 18, 2025 07:39
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Aug 19, 2025

@trask can you check again?

trask
trask reviewed Aug 20, 2025
View reviewed changes
Comment thread ...rary/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java Outdated
Comment thread ...library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java
Comment thread ...in/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java Outdated
Comment thread ...java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java Outdated
Comment thread .../java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java Outdated
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Aug 22, 2025

@trask I've separated the "extraction" logic (which is re-usable) from the declarative and non-declarative provider interfaces, which should make the code easier to maintain (e.g. to delete the non-declarative classes)

@otelbot-java-instrumentation
Copy link
Copy Markdown
Contributor

otelbot-java-instrumentation Bot commented Aug 22, 2025

🔧 The result from spotlessApply was committed to the PR branch.

@zeitlinger zeitlinger force-pushed the declarative-config-resource-providers branch from 66b0827 to 27bcee2 Compare August 29, 2025 13:39
@otelbot-java-instrumentation
Copy link
Copy Markdown
Contributor

otelbot-java-instrumentation Bot commented Aug 29, 2025

🔧 The result from spotlessApply was committed to the PR branch.

@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Sep 1, 2025

@trask can you check again?

@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Sep 2, 2025

where can I add an integration test tests all resource providers, including a customizer in javaagent-tooling.

I put it in https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14222/files#diff-a437e5890ee916a520c44636f60217781d18909c5b5515b54f882df75ce7100a for now.

@laurit do you have an idea?

@zeitlinger zeitlinger force-pushed the declarative-config-resource-providers branch from 6acc35c to 194d2cb Compare September 8, 2025 10:02
@zeitlinger zeitlinger added this to the v2.20.0 milestone Sep 11, 2025
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Sep 11, 2025

@laurit @trask can we get this into the next release?

This would allow us to have milestone 1 ready for the release after that.

laurit
laurit reviewed Sep 11, 2025
View reviewed changes
Comment thread smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ResourceCustomizerSmokeTest.groovy Outdated
@zeitlinger
Copy link
Copy Markdown
Member Author

zeitlinger commented Sep 11, 2025

@laurit please check again

trask
trask reviewed Sep 11, 2025
View reviewed changes
Comment thread ...g/src/main/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProvider.java Outdated
// (DistroComponentProvider in this package)
// service: adds "service.name" and "service.instance.id" attributes
// (https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetector.java)
private static final List<String> REQUIRED_DETECTORS = Arrays.asList("distribution", "service");
Copy link
Copy Markdown
Member

@trask trask Sep 11, 2025

Choose a reason for hiding this comment

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

should we leave out service since it's promoting using env var instead of:

https://github.com/open-telemetry/opentelemetry-configuration/blob/b1197246d98be051ede286ea29f20562b062d5e0/examples/kitchen-sink.yaml#L788-L789

Copy link
Copy Markdown
Member Author

@zeitlinger zeitlinger Sep 12, 2025

Choose a reason for hiding this comment

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

the follow up: #14639

trask
trask approved these changes Sep 11, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14222/files#r2341481892 let's remove service detector for now and we can discuss adding it further (easier to add it later than to remove it later)

trask
trask reviewed Sep 11, 2025
View reviewed changes
Comment thread ...oling/src/main/java/io/opentelemetry/javaagent/tooling/resources/DistroResourceProvider.java
@Override
public Resource createResource(ConfigProperties config) {
return get();
return get("opentelemetry-java-instrumentation");
Copy link
Copy Markdown
Member

@trask trask Sep 11, 2025

Choose a reason for hiding this comment

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

can you open an issue to change this in 3.0?

Copy link
Copy Markdown
Member Author

@zeitlinger zeitlinger Sep 11, 2025

Choose a reason for hiding this comment

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

#14634

@trask trask merged commit 2c3eabf into open-telemetry:main Sep 11, 2025
89 checks passed
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Done in Declarative Configuration: Java Sep 11, 2025
@zeitlinger zeitlinger deleted the declarative-config-resource-providers branch September 12, 2025 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@trask trask trask approved these changes

@laurit laurit laurit left review comments

@jaydeluca jaydeluca jaydeluca approved these changes

Assignees

@zeitlinger zeitlinger

Labels

None yet

Projects

Declarative Configuration: Java
Status: Done

Milestone

v2.20.0

Development

Successfully merging this pull request may close these issues.

missing resource providers for declarative config

4 participants

@zeitlinger @trask @laurit @jaydeluca