Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace inferred-spans extension with upstream contrib extension #370

Merged
merged 15 commits into from
Jan 10, 2025

Conversation

JonasKunz
Copy link
Contributor

Closes #174.
Replaces the inferred-spans extension with the contributed upstream one, but maintains a backwards compatibility layer for the ELASTIC_ options because they are used a lot already in demos.

This PR is also kind of blocked by elastic/apm-data#321. That change did not make it into 8.15. We'll need that change to ship, otherwise the parent-child overriding won't wokr correctly, because the attribute elastic.is_child was renamed to is_child.

@JonasKunz JonasKunz force-pushed the inferred-spans-upstream branch from a874dbb to 8aa033c Compare August 19, 2024 08:19
@JonasKunz JonasKunz mentioned this pull request Aug 19, 2024
10 tasks
# Conflicts:
#	inferred-spans/README.md
#	inferred-spans/src/main/java/co/elastic/otel/profiler/InferredSpansAutoConfig.java
#	inferred-spans/src/test/java/co/elastic/otel/InferredSpansAutoConfigTest.java
#	licenses/more-licences.md
@JonasKunz
Copy link
Contributor Author

Support for is_child without the elastic prefix will be part of the 8.15.1 release.

@JonasKunz
Copy link
Contributor Author

Waiting on open-telemetry/opentelemetry-java-contrib#1533 to implement full backwards compatibility

@JonasKunz
Copy link
Contributor Author

open-telemetry/opentelemetry-java-contrib#1533 is now part of the included contrib version, so this PR is ready for review

@JonasKunz JonasKunz marked this pull request as ready for review January 3, 2025 13:16
@JonasKunz JonasKunz requested a review from a team January 3, 2025 13:16
Copy link
Member

@SylvainJuge SylvainJuge left a comment

Choose a reason for hiding this comment

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

Good job and very nice diff karma !

@jackshirazi
Copy link
Contributor

are we still going to be generating an extension jar that will be included in the docker image?

@JonasKunz
Copy link
Contributor Author

are we still going to be generating an extension jar that will be included in the docker image?

Not sure what you mean exactly with an "extension jar that will be included in the docker image" ?

I don't think it is worth anymore to publish this inferred-spans variant on maven-central anymore, because it is now just acompatibility layer for legacy options. Therefore I've removed the maven publish in 6b62114.

However, we'll still be publishing it as part of the agentextension jar which allows you to load all our distro features into a vanilla agent. But I don't think we put this jar in our docker image, do we?

@jackshirazi
Copy link
Contributor

However, we'll still be publishing it as part of the agentextension jar which allows you to load all our distro features into a vanilla agent. But I don't think we put this jar in our docker image, do we?

Yes, we do. The docker image is set up for the otel operator so that it can be used both as an image for running the agent and separately as an image to include our extensions. The latter requires the agentextension jar to be in a specific location.

So your answer is ultimately yes :-)

@JonasKunz JonasKunz merged commit 301c7be into elastic:main Jan 10, 2025
18 checks passed
@JonasKunz JonasKunz deleted the inferred-spans-upstream branch January 10, 2025 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Contribute upstream: inferred spans
3 participants