Skip to content

Scale back ignores#1293

Merged
mar-kolya merged 16 commits into
masterfrom
mar-kolya/scale-back-ignores
Mar 6, 2020
Merged

Scale back ignores#1293
mar-kolya merged 16 commits into
masterfrom
mar-kolya/scale-back-ignores

Conversation

@mar-kolya
Copy link
Copy Markdown
Contributor

@mar-kolya mar-kolya commented Mar 5, 2020

Include java-concurrent instrumentation in all instrumentations when running tests.

This has uncovered bugs in java-concurrent instrumentation and grpc instrumentation which should also be fixed by this PR.

@mar-kolya mar-kolya changed the title Mar kolya/scale back ignores Scale back ignores Mar 5, 2020
@mar-kolya mar-kolya marked this pull request as ready for review March 5, 2020 16:56
@mar-kolya mar-kolya requested a review from a team as a code owner March 5, 2020 16:56
@tylerbenson
Copy link
Copy Markdown
Contributor

@mar-kolya see #1301

@mar-kolya mar-kolya force-pushed the mar-kolya/scale-back-ignores branch from 81acf58 to 39bd80d Compare March 6, 2020 15:57
mar-kolya added 16 commits March 6, 2020 13:49
Looks like it has lots of runnables sprinkled all over the place
It has some runnables and it is not very big
Otherwise `Runnable` may define `call` method leading to
instrumentation exception.
See `org.h2.util.Task` as an example.
Since we include concurrent instrumentation for all instrumentatin
projects now there is no point in including it in every instrumentation.
Classloading instrument core JDK classes so we should make sure this
doesn't have bad effects on other instrumentations.
@mar-kolya mar-kolya force-pushed the mar-kolya/scale-back-ignores branch from 39bd80d to 46b776f Compare March 6, 2020 18:51
Copy link
Copy Markdown
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.

nice work.

testCompile project(':dd-java-agent:instrumentation:java-concurrent')
// FIXME: we should enable this, but currently this fails tests for google http client
//testCompile project(':dd-java-agent:instrumentation:http-url-connection')
testCompile project(':dd-java-agent:instrumentation:classloading')
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.

nice call adding this too.

@tylerbenson tylerbenson added this to the 0.46.0 milestone Mar 6, 2020
@mar-kolya mar-kolya merged commit 98ea5a8 into master Mar 6, 2020
@mar-kolya mar-kolya deleted the mar-kolya/scale-back-ignores branch March 6, 2020 19:34
@randomanderson randomanderson mentioned this pull request Mar 27, 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.

2 participants