Commit Graph

590 Commits

Author SHA1 Message Date
Tyler Benson 84b7080860 Fix AgentInstaller ignores and @Trace naming 2018-05-03 13:03:53 +10:00
Tyler Benson 0f77ccd797
Merge pull request #297 from DataDog/tyler/kafka
Add null check to kafka
2018-05-02 08:06:37 +10:00
Tyler Benson 6f64b0e021 Prevent JDBC spans from nesting 2018-05-01 11:18:53 +10:00
Andrew Kent 3c7d4f5b13 Enable executor instrumentation by default
Executor instrumentation does not need to be turned off by default
because the instrumentation will not apply unless the TraceScope is
activated.
2018-04-30 17:27:51 -07:00
Tyler Benson 63d308e50d Misc cleanup/minor changes 2018-05-01 10:24:14 +10:00
Tyler Benson 21e26d9463
Merge pull request #301 from jonmort/ratpack-instrumentation-exceptions
Fix NoClassDefFound errors for ratpack
2018-05-01 09:57:16 +10:00
Jon Mort c1a7f58aaf
Fix NoClassDefFound errors for ratpack 2018-04-30 15:24:42 +01:00
Tyler Benson cd289308bb Remove timeouts.
Not helping as much as was hoped.  Causing extra noise in CI.
2018-04-30 11:10:18 +10:00
Tyler Benson e6179f6555 Use hardcoded operation names for integrations
Backend has issues with variable operation names.

Also reduce dependencies on OT-contribs.
2018-04-27 12:37:19 +10:00
Andrew Kent 353bc1be07
Merge pull request #294 from DataDog/ark/fix_jax
Inject jax InjectAdapter helper class.
2018-04-26 14:39:15 -07:00
Andrew Kent 5f19a56683 Inject jax InjectAdapter helper class. 2018-04-26 09:52:45 -07:00
Tyler Benson 3db2d654f1 Fix spark instrumentation
and rebase off master.
2018-04-26 17:01:45 +10:00
Jørgen Grøndal de350c7c4f fix: attempt to enable instrumentations 2018-04-26 14:53:32 +10:00
Jørgen Grøndal bb5c413be1 fix: create a test to verify that spark is indeed responding 2018-04-26 14:53:32 +10:00
Jørgen Grøndal ede4620b52 feat: get tests running, although failing due to instrumentation not being loaded properly 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 7e233ac3c7 feat: find oldest supported spark, update version, make tests run 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 8b289c7036 fix: add versionScan for sparkjava 2018-04-26 14:53:32 +10:00
Jørgen Grøndal d0822c7458 fix: support jetty 8+, sparkjava 2.5+ 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 8bfeae4a82 fix: formatting and add version to spark java instrumentation 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 593a9b71ad fix: use google java format 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 79f1226867 fix: use correct jetty version 2018-04-26 14:53:32 +10:00
Jørgen Grøndal c49d4f6dd8 fix: add jetty handler instrumentaiton. remove filter3instrumentation. add sparkjava routematch instrumentation 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 6c4b90965c fix: support java 7 in test 2018-04-26 14:53:32 +10:00
Jørgen Grøndal 91aa3c854d fix: first attempt at sparkjava trace instrumentation 2018-04-26 14:53:32 +10:00
Andrew Kent f295b73d4b
Merge pull request #276 from jonmort/ratpack-support
Ratpack instrumentation support
2018-04-24 07:09:00 -07:00
Jon Mort 35ad8c9f49
Tidy up RatpackTest comments 2018-04-24 08:17:37 +01:00
Jon Mort b4510b7987
Add a guard against wrapping the ratpack request action multiple times 2018-04-24 08:07:48 +01:00
Jon Mort fa90af7fbc
Introduce a java 8 source set for Ratpack integration 2018-04-18 11:44:15 +01:00
Jon Mort 4875165053
Only build ratpack when using a java 8 compiler 2018-04-18 11:44:15 +01:00
Jon Mort 18da2444d1
Correctly look for classes to determine minimum ratpack version 2018-04-18 11:44:15 +01:00
Jon Mort 1ba0b69750
Resource naming and other review comments 2018-04-18 11:42:49 +01:00
Jon Mort 582c0af962
Rename to Ratpack 1.4 2018-04-18 11:42:49 +01:00
Jon Mort 6c1c830805
Apply review comments 2018-04-18 11:42:49 +01:00
Jon Mort 6e92221e5a
Ratpack instrumentaiton support 2018-04-18 11:42:48 +01:00
Tyler Benson c2cb7292c6 Remove okhttp instrumentation from servlet tests
seems to cause some confusion.
2018-04-18 11:58:07 +08:00
Andrew Kent c7cf1cf36d
Merge pull request #282 from DataDog/ark/async-refactor
Toggleable Async Propgation on the trace context
2018-04-17 09:44:41 -07:00
Andrew Kent 9bcd5677ed
Merge pull request #287 from DataDog/ark/logging
Logging
2018-04-17 09:26:32 -07:00
Andrew Kent 364b3e999a Remove warning from mongo listener. Add injection debug logging. 2018-04-16 10:34:46 -07:00
Tyler Benson 001e59e0cc Build with Java 8, but run tests with other JDKs
Use workspaces to persist build between jobs.
2018-04-16 14:36:38 +08:00
Andrew Kent 2d92ed2bed Use the same operationName for all play requests 2018-04-11 13:32:58 -07:00
Andrew Kent d594d6e8db Don't create continuations when async propagation is off 2018-04-11 13:32:58 -07:00
Andrew Kent a0a11a51d0 Use ScopeManager to enable/disable low level async instrumentation. 2018-04-11 13:32:58 -07:00
Andrew Kent 0d7aa022db Refactor ContinuableScope 2018-04-11 13:32:58 -07:00
Andrew Kent 6e62b79b8f Separate executor and scala future tests 2018-04-11 13:32:58 -07:00
Andrew Kent 63ae144734
Merge pull request #277 from DataDog/ark/play
Play 2.4-2.6 Instrumentation
2018-04-09 13:39:03 -04:00
Andrew Kent fc27e6b5ae Revert "Move play2.6 tests out of subproject and into sourceSet"
This reverts commit 2a42f7dc7d.
2018-04-08 10:10:12 -07:00
Andrew Kent 8941d167c9 Use bootstrap CallDepthThreadLocalMap in classloader instrumentation 2018-04-06 14:11:19 -04:00
Andrew Kent 2a42f7dc7d Move play2.6 tests out of subproject and into sourceSet 2018-04-06 14:03:20 -04:00
Andrew Kent cb864b1f33 Enable play testing for java8+ 2018-04-06 12:28:01 -04:00
Andrew Kent 2449810ce0 Play 2.4 and 2.6 testing 2018-04-05 17:58:04 -04:00
Andrew Kent 31c7d2d328 Use CallDepthThreadLocalMap in sql Connection init 2018-04-04 15:34:43 -04:00
Andrew Kent 5f8a83486a Play instrumentation cleanup
Simplify error collecting. Use slf4j to log. randomOpenPort util.
2018-04-02 17:54:22 -07:00
Tyler Benson a1a2a0db27 Improve naming for instrumentation class. 2018-03-30 10:54:15 +08:00
Tyler Benson 513cded8aa Advice shouldn’t reference fields from non-injected classes
It might not be accessible on the classpath and cause failures.
2018-03-30 10:50:07 +08:00
Tyler Benson 71eb71e53e Enable instrumentation by default and rev version. 2018-03-29 11:46:15 +08:00
Andrew Kent 772872bcb5 Play Instrumentation 2018-03-28 10:26:57 -07:00
Andrew Kent 457cddbb28 Add missing helper to servlet2 helper injector 2018-03-23 16:53:43 -07:00
Andrew Kent 288c9e20de
Merge pull request #269 from DataDog/run_single_idea_test
Remove opentracing from TestRunner fields to support Idea single test run
2018-03-23 08:32:53 -07:00
Andrew Kent a004337576 Remove opentracing from TestRunner fields to support single test run 2018-03-22 21:16:36 -07:00
Tyler Benson aeb1f073a3 Better support for TIbco Temporary Queues/Topics
When consuming, tibco JMS client doesn’t properly identify temporary destinations with the proper type, so we must rely on the name to determine if it is temporary.
2018-03-23 11:53:04 +08:00
Andrew Kent 3eac216a04 Use defaultTransformers in all instrumentation 2018-03-20 15:59:11 -07:00
Andrew Kent 0714139b31
Merge pull request #264 from DataDog/ark/bs-testing
Akka Instrumentation
2018-03-20 09:42:18 -07:00
Andrew Kent 714afba71b Akka actor instrumentation 2018-03-20 09:31:54 -07:00
Tyler Benson 07694a1f99 Remove dead code. 2018-03-20 14:02:23 +08:00
Tyler Benson 19b94da7bb JAX-RS Client Tracing 2018-03-20 08:54:09 +08:00
Andrew Kent c529c06801 Ignore failures to instrument proxy classes 2018-03-19 16:07:45 -07:00
Andrew Kent 84081dc980 Move logger to test bootstrap 2018-03-19 16:07:45 -07:00
Andrew Kent 5a97c1e5bb Copied scala tests over from integration tests 2018-03-19 16:07:45 -07:00
Andrew Kent 84fe1fc0e3 Organize bootstrap and agent classes by known prefix. 2018-03-15 12:17:03 -07:00
Andrew Kent 878d92f5b2 Test under custom classloader 2018-03-15 12:17:03 -07:00
Andrew Kent 10e12a666a Use builtin decorators for every DDTracer 2018-03-13 12:46:48 -07:00
Andrew Kent b5b38ee4b1 Mark all http status codes 5xx as an error. 2018-03-13 12:46:48 -07:00
Andrew Kent b5759bd15c Add decorators to servlet tests 2018-03-13 12:46:48 -07:00
Tyler Benson bbb0da22ab SpringWebErrorHandler capture stacktrace, but not set error
We will rely on a decorator instead to do so.
2018-03-13 12:07:31 +10:00
Andrew Kent c3c76c81e6 Trap agent errors in DDTracingClientExec 2018-03-12 16:33:13 -07:00
Tyler Benson 0fbec69b6d
Merge pull request #253 from DataDog/tyler/traceinterceptor
Implement the TraceInterceptor API
2018-03-13 08:30:01 +10:00
Andrew Kent 428e304164 Rename ContextPropagator to TraceScope 2018-03-12 10:29:50 -07:00
Andrew Kent 45aff57740 Assert on executor span relationships 2018-03-09 12:59:12 -08:00
Andrew Kent 21180530ea Remove opentracing from dd-trace-api 2018-03-09 11:50:39 -08:00
Andrew Kent 81b70fb0e4 Disable async instrumentation by default. 2018-03-09 11:50:39 -08:00
Andrew Kent 4a11fc6d96 Whitelist Executor Instrumentation 2018-03-09 11:50:39 -08:00
Andrew Kent 9a83413141 Executor Instrumentation for Scala 2018-03-09 11:50:39 -08:00
Tyler Benson fb74c7b4cb Wrap super/parent type matchers in failSafe
To prevent errors on injected classes.
2018-03-09 14:45:08 +10:00
Tyler Benson 286e9d2d00 Add instrumentation to catch additional classloaders.
Still doesn’t work with Spring Boot because the way they structure their Jars.
2018-03-09 14:32:41 +10:00
Tyler Benson c99f10c0d2 Decouple trace flush from collection
Wait until all spans are finished or garbage collected before reporting trace.
2018-03-09 14:31:48 +10:00
Tyler Benson f31632be33 Remove deprecated usage. 2018-03-09 14:31:48 +10:00
Tyler Benson 5d1297f125 Extract a trace out to a specific class
Rather than it just be a list of spans…
This allows for tracking of if the trace was reported or not, and in the future to do so independently of finishing the span.
2018-03-09 14:31:48 +10:00
Tyler Benson 9b1d454eb9 Combine Threadlocal and RefCounting into single Scope
Also added additional tests.
2018-03-09 14:31:48 +10:00
Andrew Kent b2af7491a8 Remove Jackson from AWS Helper class 2018-03-02 13:01:31 -05:00
Tyler Benson 4c66bc8ed2 Use nanotime for additional clock resolution
If a start or stop timestamp on a span is provided, the nanotime is ignored.
2018-02-23 13:13:34 +10:00
Tyler Benson 163b285868 Rename to jedis-1.4 since that’s the earliest working version
Also change instrumentation binding for better coverage.
2018-02-23 13:04:46 +10:00
Tyler Benson f4d2e6f600 Merge branch 'master' into jedis 2018-02-22 16:44:44 +10:00
Tyler Benson 574ba6d954
Merge pull request #237 from DataDog/tyler/set-timeout
Set timeouts on all the tests.
2018-02-22 13:16:04 +10:00
Tyler Benson 903248ddf2 Set timeouts on all the tests. 2018-02-21 12:09:57 +10:00
Tyler Benson a3a70e6ea3 Remove unneeded dependency on dd-trace-ot. 2018-02-21 12:08:05 +10:00
gihad 44dd384648 reusing declared values to make tests more roboust 2018-02-18 08:38:47 -05:00
gihad 692b6e7508 removed tabs for spaces 2018-02-18 08:24:54 -05:00
gihad 3613b9bd7d removed unused import 2018-02-17 22:35:45 -05:00
gihad 7c42e2e791 Added jedis instrumentation integration tests with embedded redis 2018-02-17 21:30:18 -05:00
Andrew Kent c118e1b73d Move SpringBootBasedTest to package folder. 2018-02-16 13:42:27 -08:00
Andrew Kent c6e883e042 Move bootstrap prefixes to classloader matcher 2018-02-15 19:17:19 -08:00
Andrew Kent 64e2173bf7 Set bootstrap delegation for osgi classloading 2018-02-15 19:17:19 -08:00
Andrew Kent 1820fbcbfd Bootstrap delegation for wildfly/jboss 2018-02-15 19:17:19 -08:00
Andrew Kent dd19b07017 Spock classloading tests 2018-02-15 19:17:19 -08:00
Andrew Kent a28a7abd4e Run api classes on bootstrap and core agent on custom classloader 2018-02-15 19:17:19 -08:00
Andrew Kent cfef64b026 Reorganize dd-java-agent subprojects 2018-02-15 18:55:02 -08:00
Tyler Benson c9da16f334 Add resource naming instrumentation for jax-rs 2018-02-14 19:18:01 +10:00
Gihad Murad fb7a81c2bd Removed unused tag, extended Instrumenter.Configurable (disabled by default) 2018-02-13 17:56:36 -05:00
Gihad Murad 7e82985d3c Merge branch 'master' into jedis 2018-02-13 11:58:14 -05:00
Tyler Benson 3ec70ac026 Add instrumentation for spring error handling
Also add additional tests for spring boot
2018-02-13 09:07:53 +10:00
Tyler Benson 1069922233 Add additional tags for aws requests 2018-02-08 15:12:17 +10:00
Tyler Benson 3e57a7a7ea Move servlet tests to individual modules. Fix servlet 2 instrumentation.
Turns out we weren’t actually servlet 2 compatible.  That should be fixed now.  Unfortunately it appears servlet 2 also doesn’t expose the http response code, so we aren’t able to set it as a tag without custom instrumentation for each framework.

I also removed our log4j2 stuff since we’re using logback.
2018-02-08 09:27:04 +10:00
Tyler Benson 1bfceb0d53 Use Field.ERROR_OBJECT instead of string 2018-02-07 12:02:10 +10:00
Andrew Kent b557776bcf
Merge pull request #217 from DataDog/tyler/ipv4-string
Use string instead of int representation for IPv4
2018-02-06 09:25:20 -08:00
Tyler Benson 0ca6082a6e Use string instead of int representation for IPv4 2018-02-06 17:30:44 +10:00
Tyler Benson a311d5f57d Change AWS instrumentation to use constructor
Instead of requiring the builder.
2018-02-06 15:01:50 +10:00
Tyler Benson 7d28a32fba Allow instrumentation to be disabled
By default, instrumentation is enabled, and can be disabled by default by overriding the `defaultEnabled` method. Instrumentation can also be disabled individually or enabled when default is disabled.
2018-02-06 11:20:05 +10:00
Gihad Murad 1d35938996 Merge branch 'master' into jedis 2018-02-05 13:00:13 -05:00
Gihad Murad cef86291e3 Added Redis instrumentation via Jedis client 2.9 and changed spring-boot-jdbc to spring-boot-jdbc-redis 2018-02-05 12:59:42 -05:00
Tyler Benson 4314f71ab7 Kafka and Kafka Streams instrumentation
This includes propagation and traces for producers and consumers.
2018-02-01 20:04:40 +10:00
Andrew Kent 8d53e4703d Set span.type for all integrations. 2018-01-31 16:13:41 -08:00
Andrew Kent 7920cc9d8e Set span.type tag 2018-01-31 12:22:43 -08:00
Tyler Benson 13c774e7ff Fix AWS integration
Handler was being added on builder return, which was too late.  It appears it would have also failed if an existing handler resulted in a unmodifiable list to be returned.
2018-01-31 10:18:51 +10:00
Tyler Benson 29ffdf7354 Change escape sequence since SQS doesn’t like $ characters. 2018-01-31 08:14:02 +10:00
Tyler Benson c1f73c194e Prevent headers from being added for AWS client calls 2018-01-30 11:20:17 +10:00
Andrew Kent 140c3add96
Merge pull request #205 from DataDog/ark/aws_base_instrumentation
aws base instrumentation
2018-01-25 17:55:41 -08:00
Andrew Kent d731789d38 Remove copy-paste from spring and trace instrumentation 2018-01-25 09:47:14 -08:00
Andrew Kent 839ed9f0cb Use a thread-safe synchronized weak hash map. 2018-01-25 09:47:14 -08:00
Andrew Kent f5d1eef72a Match All AWS Builder subclasses.
Match All AWS Builder subclasses. Also fix bug of potentially
replacing configure request handlers when we add the dd request handler.
2018-01-25 09:39:43 -08:00
Tyler Benson ce9e5dd3de Reenable java 7 and 9 CI
Also try to make it so builds can be rerun independently by not using the workspace.
2018-01-23 15:54:05 -05:00
Tyler Benson 6fbe494934 Exclude tests that are Java 9 incompatible. 2018-01-23 14:59:10 -05:00
Tyler Benson 9acbe5710e
Merge pull request #198 from DataDog/tyler/update
Update dependencies
2018-01-22 16:47:50 -05:00
Tyler Benson 53a575dc74 Update dependencies 2018-01-22 15:08:28 -05:00
Tyler Benson 64d39030e5 Use workflows in Circle to test Java 7 and 8
Java 9 is commented out because there are some test failures that will be investigated later.

Some tests had to be excluded from Java 7 because they don’t have a Java 7 compatible version.
2018-01-22 13:46:50 -05:00
Tyler Benson f0d333c2ec Defend against potential NPEs
If `HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE` happens to be missing.
2018-01-19 15:48:12 -05:00
Tyler Benson 111c5ee689 Fix wrong class name being injected 2018-01-17 15:09:42 -05:00
Andrew Kent 11a2d3bdd4 Fix helpers for httpclient, and servlet3 2018-01-16 16:10:28 -05:00
Tyler Benson b2b61e0c8c Changes required for supporting OT 0.31.0
Also updates all the contrib versions that we currently depend on to their 0.31.0 supporting versions.
2018-01-16 09:52:28 -05:00
Tyler Benson 6d3d88987b Rename dd-trace-annotations to dd-trace-api
And move DDTags over to it.
Move some `datadog.trace.api` classes over to `datadog.trace.common`.
Other misc renaming.
2018-01-09 10:07:36 +10:00
Tyler Benson becf2a5862 Lots of renaming
Module:
dd-trace -> dd-trace-ot

Packages:
Standardize on `datadog.trace` and `datadog.opentracing` as the package prefixes.
2018-01-09 10:02:06 +10:00