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

Split akka actor instumentation #3173

Merged
merged 1 commit into from
Jun 3, 2021
Merged

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Jun 2, 2021

Split akka actor instrumentation into actor instrumentation and fork join instrumentation. Fork join code is gone from the latest akka and this makes muzzle fail the whole instrumentation because of mismatched references.
This pr also enables akka instrumentation by default. If anybody knows the reason why it was disabled then please speak up.

Copy link
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.

Split akka actor instrumentation into actor instrumentation and fork join instrumentation. Fork join code is gone from the latest akka and this makes muzzle fail the whole instrumentation because of mismatched references.

👍 and we can move it over to contrib when we move over old instrumentation versions

This pr also enables akka instrumentation by default. If anybody knows the reason why it was disabled then please speak up.

IIRC (which I may not) we disabled it by default in #911 because it was causing context leaks in the akka http tests. I'm good with enabling it.

Comment on lines +10 to +19
pass {
group = 'com.typesafe.akka'
module = 'akka-actor_2.12'
versions = "[2.5.0,)"
}
pass {
group = 'com.typesafe.akka'
module = 'akka-actor_2.13'
versions = "(,)"
}
Copy link
Member

Choose a reason for hiding this comment

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

👍

jvmArgs '-Dotel.instrumentation.akka-actor.enabled=true'
if (findProperty('testLatestDeps')) {
configurations {
// akka artifact name is different for regular and latest tests
Copy link
Member

Choose a reason for hiding this comment

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

👍

@trask trask merged commit a48499d into open-telemetry:main Jun 3, 2021
robododge pushed a commit to robododge/opentelemetry-java-instrumentation that referenced this pull request Jun 17, 2021
@laurit laurit deleted the akka-actor-split branch August 24, 2021 07:52
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