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

Port otel/1090 #1852

Merged
merged 5 commits into from
Sep 10, 2020
Merged

Port otel/1090 #1852

merged 5 commits into from
Sep 10, 2020

Conversation

devinsba
Copy link
Contributor

@devinsba devinsba commented Sep 9, 2020

Ports open-telemetry/opentelemetry-java-instrumentation#1090 from @trask which since I also believe this is not needed.

TODO add some tests with java 8 and lambdas to ensure this isn't breaking things subtly and add some tests around executors that are on our classpath that have their own queue implementations

@@ -1,77 +0,0 @@
package datadog.trace.instrumentation.java.concurrent;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mcculls looks like you an I might have some conflict here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mcculls deleting this file seems to be the same thing you accomplished in your PR right? Removing the weakmap access?

@@ -12,9 +11,6 @@
@Slf4j
public class ExecutorInstrumentationUtils {

private static final WeakMap<Executor, Boolean> EXECUTORS_DISABLED_FOR_WRAPPED_TASKS =
Copy link
Member

Choose a reason for hiding this comment

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

Aww I hate seeing these disappear :(

@devinsba devinsba marked this pull request as ready for review September 9, 2020 19:04
Copy link
Contributor

@tylerbenson tylerbenson left a comment

Choose a reason for hiding this comment

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

I forget... without this, how is ScheduledExecutorService handled?

@devinsba
Copy link
Contributor Author

devinsba commented Sep 9, 2020

@devinsba devinsba merged commit 849a6bb into master Sep 10, 2020
@devinsba devinsba deleted the brian.devinssuresh/otel-1090 branch September 10, 2020 14:25
@github-actions github-actions bot added this to the 0.62.0 milestone Sep 10, 2020
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.

None yet

3 participants