Commit Graph

2094 Commits

Author SHA1 Message Date
Laplie Anderson d2db6b6fd9
Merge pull request #1098 from DataDog/tyler/jax-rs-annotation-inheritance
Support JAX-RS Annotation Inheritance
2019-12-06 13:49:46 -05:00
Brian Devins-Suresh c72f2d3b45 Fix muzzle test for 3.0 2019-12-06 13:45:05 -05:00
Brian Devins-Suresh 73eb217721 Make matchers more strict 2019-12-05 17:02:39 -05:00
Brian Devins-Suresh 2e5aff391d Use random ports for embedded redis 2019-12-05 16:23:22 -05:00
Brian Devins-Suresh 00fb29f528 Some clean up 2019-12-05 15:59:12 -05:00
Brian Devins-Suresh 7b92c40cbc Add support for jedis 3.0+ 2019-12-05 15:09:58 -05:00
Laplie Anderson 42ac5fc024 Remove synchronization and static helper map 2019-12-04 15:43:28 -05:00
Tyler Benson 57c3ec196f
Merge pull request #1104 from trask/normalize-tag-verification
Normalize tag verification
2019-12-02 10:58:03 -08:00
Trask Stalnaker ae0eb52cd7 Fix sporadic test failure 2019-11-27 10:31:59 -08:00
Trask Stalnaker 847a76cb04 Add missing tag verification 2019-11-22 10:59:47 -08:00
Trask Stalnaker 1987e86ebf Normalize tag verification order 2019-11-22 10:59:45 -08:00
Douglas Q Hawkins 2d87882724
Merge pull request #1112 from DataDog/dougqh/jmxfetch-config-resource-leak
Closing metricconfigs.txt
2019-11-22 13:51:50 -05:00
dougqh 75727840df Closing metricsconfigs.txt 2019-11-22 13:08:56 -05:00
Tyler Benson 10b0f35235
Merge pull request #1090 from DataDog/tyler/servlet-path
Add servlet.path tag
2019-11-22 09:18:14 -08:00
dougqh be9743b86b Eliminate class expression to Advice class
Changing Jasper instrumentation to not load the advice class.
This class was missed originally because it doesn't end in Advice.
2019-11-22 09:51:05 -05:00
Laplie Anderson f0bbd46097 Typo in merge conflict resolution 2019-11-21 13:07:02 -05:00
Laplie Anderson f1362a7d57
Merge branch 'master' into tyler/jax-rs-annotation-inheritance 2019-11-21 12:51:01 -05:00
Laplie Anderson 45c16a1c55 Create Play WS 2.1 Project 2019-11-20 18:13:41 -05:00
Zachary Groves c4cebc30c8
Merge pull request #1097 from DataDog/ZStriker19/remove_duplicate_okhttp_span_and_okhttp_separate_service
Remove duplicate Okhttp span and stop separate service creation of ok…
2019-11-20 17:01:18 -06:00
Laplie Anderson aa46e81e19 Copy instrumentation to jax-rs2 2019-11-20 15:38:17 -05:00
Laplie Anderson 75d66dee21 clean and fix tests 2019-11-20 13:14:35 -05:00
Laplie Anderson 7640e68337 The same classwalking is necessary for @Path 2019-11-20 13:07:04 -05:00
Laplie Anderson fd4e2d09e1 Fix method iterable logic. methodPath, httpMethod working 2019-11-20 10:18:00 -05:00
Laplie Anderson 99acb52589
Merge pull request #1103 from DataDog/landerson/load-generator
Simple load generator tool
2019-11-19 10:19:14 -05:00
dougqh 6b096c2240 Replacing Advice.class references
Replacing Advice.class references with string construction.

This stops the JVM from loading the Advice classes which are used as templates for byte buddy and doesn't ever need to be run directly.

This eliminates ~130 class loads at start-up -- and saves 0.5MiB in metaspace
2019-11-18 16:09:30 -05:00
dougqh 022257ee55 Fixing resource leak
To check for existence, switching from getResourceAsStream to getResource
2019-11-18 10:52:23 -05:00
ZStriker19 caaff02c87 Needed to run Java google format. 2019-11-15 15:30:39 -05:00
Tyler Benson 393a88585a First pass at supporting annotations inheritance for JAX-RS
[skip ci]
2019-11-15 11:53:16 -08:00
ZStriker19 c0ba1d3446 Changed test file permissions to match master. 2019-11-15 13:42:28 -05:00
ZStriker19 348cbc74c2 Changed okhttp file permissions back to original settings. 2019-11-15 13:29:51 -05:00
Tyler Benson a77045b9dc Add more complexity to jersey resource test
This demonstrates a matching failure in our current instrumentation.
2019-11-14 16:01:16 -08:00
ZStriker19 8fb32b5730 Remove duplicate Okhttp span and stop separate service creation of okhttp. Instead okhttp will now appear as part of the service that is using okhttp to make the call. 2019-11-14 17:29:28 -05:00
Laplie Anderson 509e655518 Move play-ws-1 and play-ws-2 into separate packages 2019-11-13 16:41:12 -05:00
Laplie Anderson 03b3fa6651
Merge pull request #1092 from DataDog/landerson/debug-instrumentation-names
Print all instrumentation names when muzzled
2019-11-13 16:36:40 -05:00
Laplie Anderson 251ceeb978 Print all instrumentation names when muzzled 2019-11-13 14:12:26 -05:00
Tyler Benson 53b4e5db19 fix test 2019-11-12 15:17:35 -08:00
Nikolay Martynov 2c4422aa04 Upgradle to gradle 6.0 2019-11-12 16:26:46 -05:00
Tyler Benson bff8303e18 Remove duplicate onRequest call.
This info should already be populated by the servlet framework.
2019-11-11 15:58:31 -08:00
Tyler Benson fdf2241e5f Add servlet.path tag 2019-11-11 15:54:21 -08:00
Laplie Anderson 88902046ce simple load generator tool 2019-11-07 16:50:23 -05:00
Nikolay Martynov 2789324cd5
Merge pull request #1084 from DataDog/mar-kolya/fix-agent-for-zulu8
fix agent for zulu8
2019-11-07 14:39:03 -05:00
Nikolay Martynov 8f80a42c4d Do not delay tracer on OpenJDK8 with JBOSS 2019-11-07 13:45:56 -05:00
Nikolay Martynov f371e391a8 Fix typo 2019-11-07 06:55:31 -05:00
Tyler Benson b002f0c190
Merge pull request #1085 from DataDog/tyler/remove-beta-integrations
Remove experimental jdbc and servlet integrations until further evaluation
2019-11-06 14:31:08 -08:00
Nikolay Martynov df6cb663d4 Fix test for case when tracer install is not delayed 2019-11-06 15:35:01 -05:00
Nikolay Martynov fdfe4b1dc3 More renames due to shadow clashes 2019-11-06 15:12:07 -05:00
Tyler Benson 2432a92230 Remove experimental jdbc and servlet integrations until further evaluation 2019-11-06 11:45:00 -08:00
Douglas Q Hawkins 599d1e0fab
Merge pull request #1082 from DataDog/dougqh/sisu-exclusion
Excluded classes generated by Eclipse Sisu
2019-11-06 14:41:36 -05:00
Nikolay Martynov 42cece67c2 Fix namespace clashes
Using `datadog.trace.agent` to hold agent class causes problems due to
shadowing into this package of other classes.
2019-11-06 13:58:20 -05:00
Nikolay Martynov 17155f7d57 Fix scala warning 2019-11-06 13:58:20 -05:00
Nikolay Martynov 15c1e67334 Fix agent on latest zulu8
The problem was that on zulu8 loading OkHttp touches JFR which in turn
touches log manager - which would break things like JBOSS.

The fix is to delay installing agent (and writer) until log manager
things have settled down - in way similar to jmxfetch.

Unfortunately for 'main' agent this turns out to be more involved
because of classloader shenanigans.
2019-11-06 10:09:50 -05:00
Nikolay Martynov 3715a3df53 Fix ClassLoadingTest
It should use real class to try to load
2019-11-06 09:57:09 -05:00
Nikolay Martynov 58d6103361 Allow big outputs in forked test processes 2019-11-06 09:38:53 -05:00
dougqh 270a440162 Excluded classes generated by Eclipse Sisu
This change excludes classes generated by Eclipse Sisu (part of Equinox DS).

These classes are created by https://github.com/eclipse/sisu.inject/blob/master/org.eclipse.sisu.inject/src/org/eclipse/sisu/space/CloningClassSpace.java
2019-11-05 15:20:52 -05:00
Nikolay Martynov 415a875dfc Add generic is-before-java9 check 2019-11-05 13:08:21 -05:00
Nikolay Martynov b31778a05e Do not use `printStackTrace()` 2019-11-05 13:08:21 -05:00
Nikolay Martynov f236c0e8e0 Reformat some comments 2019-11-05 13:08:21 -05:00
Nikolay Martynov acfa861e4a Fix some typos 2019-11-05 13:08:21 -05:00
Nikolay Martynov 7f5b270c67 Call class loading callbacks from onComplete
This should make things more clear
2019-11-05 13:08:21 -05:00
Tyler Benson 2d3b644c84
Merge pull request #1080 from DataDog/tyler/rename-beta-configs
Rename config key for beta/experimental instrumentation.
2019-11-05 08:44:33 -08:00
Tyler Benson 4f853f5f0c Rename config key for beta/experimental instrumentation.
Postfix the existing config names with `-beta` for `servlet` and `jdbc`.

To avoid any risk that the config was explicitly enabled for an unrelated reason resulting in unexpected behavior when upgrading to the latest version.
2019-11-04 13:41:33 -08:00
Laplie Anderson 4ba0ca0f9d
Merge pull request #1078 from DataDog/landerson/big-integer-ids
Change TraceId/SpanId to BigInteger
2019-11-04 16:34:09 -05:00
Laplie Anderson bc2978e8d8 Use groovy literals for BigInteger 2019-11-04 16:16:03 -05:00
Laplie Anderson a3cd46708b
Merge pull request #1075 from DataDog/landerson/wsclient
Play WS Client instrumentation
2019-11-04 13:57:46 -05:00
Laplie Anderson bf4587c23d Missed a few test helper methods 2019-11-04 12:49:35 -05:00
Laplie Anderson cfc19facf5 Change String ids to BigInteger ids 2019-11-04 11:21:32 -05:00
Nikolay Martynov 92f62ca954 Fix scala warning 2019-11-04 08:22:20 -05:00
Laplie Anderson 9e26da85be wsclient -> play-ws 2019-11-01 14:37:06 -04:00
Laplie Anderson 68f8607dbf Fix latestDepTest dependencies 2019-10-31 11:48:52 -04:00
Laplie Anderson 3a1d331525 WSClient instrumentation 2019-10-31 11:12:00 -04:00
Laplie Anderson 64d6d39e78
Merge pull request #1074 from DataDog/landerson/circular-redirect
Add "testCircularRedirects" option to HttpClientTest
2019-10-31 10:29:36 -04:00
Laplie Anderson 8a2594eeab Add "testCircularRedirects" option to HttpClientTest 2019-10-30 18:17:49 -04:00
Tyler Benson 8e48a70c6d Fix jax-rs Path annotation inheritance
Turns out the class level path annotation overrides parent classes, so we only need to find the nearest one.

We also need to look from the instance’s class, not from where the method is defined.

Commented out a test case because we still need to compile against java 7.  That case will be added back when we upgrade to java 8.
2019-10-30 11:39:06 -07:00
kfujita b0e7e6a3f9 - fix test compile setting
- code format with google formatter
2019-10-30 08:57:13 -07:00
kfujita d8bd12bef8 This patch fixes NPE in jaxrs instrument which occurs when we use interfaces with default method and its impl class.
- reproduce NPE error with JaxRs class and interfaces in JavaInterfaces
- fix the logic target class of method with @Path annotation to avoid NPE
- setting java 1.8 for jaxrs's test
2019-10-30 08:57:13 -07:00
Tyler Benson 607dd553d4 Attempt to remove span-ordering race condition with NettyClientTest 2019-10-28 09:50:56 -07:00
Tyler Benson e4bc90d15d
Merge pull request #1067 from DataDog/tyler/db-connection
Add span when calling DataSource.getConnection with a trace.
2019-10-28 08:41:55 -07:00
Tyler Benson a903f20dc4
Merge pull request #1050 from DataDog/tyler/servlet-depth
Add new integration for Servlet Filters, HttpServlet, and RequestDispatcher
2019-10-28 08:39:56 -07:00
Tyler Benson 6703bd96bb Fix servlet propagation for “tail-call” situations
Sometimes servlets will call another servlet by “resetting” the request object.  This maintains the attributes previously set, including the span.  We want to allow the trace to start if there’s no “active trace” even if there is a span attribute.
2019-10-25 17:01:47 -07:00
Tyler Benson a3a1467192 Add span when calling DataSource.getConnection with a trace.
Disabled by default, and only creates a span if existing trace detected.

To enable:
* System Property: `-Ddd.integration.jdbc.enabled=true`
* Environment Variable: `DD_INTEGRATION_JDBC_ENABLED=true`
(Or more specifically with `jdbc-datasource`.)
2019-10-25 16:02:39 -07:00
Tyler Benson 425156115c Add new integration for Servlet Filters, HttpServlet, and RequestDispatcher
Disabled by default, and only creates a span if existing trace detected.

To enable all of them:
* System Property: `-Ddd.integration.servlet.enabled=true`
* Environment Variable: `DD_INTEGRATION_SERVLET_ENABLED=true`

(They have independent configs as well.  If needed, view the source below.)
2019-10-25 14:47:48 -07:00
Tyler Benson df387b486a
Merge pull request #1064 from DataDog/tyler/spring-controller-refactor
Refactor JAX-RS Annotation and Spring Controller/Handler Instrumentation
2019-10-25 14:44:07 -07:00
Tyler Benson fa80fee15d Refactor JAX-RS Annotation and Spring Controller/Handler Instrumentation
For spring:
* Move more logic to the decorator.
* Use a fixed operation name, but set the resource name.
* Rename the root span instead of the parent span (If there are other spans in between this could make a difference.)  Not sure what impact this would have if multiple controllers are called (ie, forward/include).

For Jax-rs:
* Rename the root span instead of the parent span (same concern as above with spring)
2019-10-25 10:19:25 -07:00
Tyler Benson 7ae5de1fc6 Refactor Servlet Advice
Moving directory structure around.
Combining advice, trying to make it propagate better.
2019-10-25 10:09:19 -07:00
Trask Stalnaker 8c558fa00e Format 2019-10-24 21:05:01 -07:00
Trask Stalnaker e32bf1816a Organize imports 2019-10-24 21:05:01 -07:00
Trask Stalnaker e06bb1db1f Remove OpenTracing gradle dependency 2019-10-24 21:05:01 -07:00
Trask Stalnaker 5bf5950bf7 Remove dependency on Tracer 2019-10-24 21:05:01 -07:00
Trask Stalnaker da80be693c Switch to new Tags class in testing module 2019-10-24 21:05:01 -07:00
Trask Stalnaker a45dc34c5c Remove testing module dependencies on GlobalTracer 2019-10-24 21:05:00 -07:00
Trask Stalnaker 86bd9793bd Switch to new Tags class in instrumetation 2019-10-24 21:05:00 -07:00
Trask Stalnaker 9182b64078 Switch to new Tags class in tests 2019-10-24 21:04:57 -07:00
Trask Stalnaker 002db5a170 Introduce Tags class
To remove dependency on OpenTracing Tags class.
2019-10-24 21:04:10 -07:00
Trask Stalnaker 99ddc497e7 Remove baggage item test
The new agent api does not have baggage item support.
2019-10-24 21:01:59 -07:00
Trask Stalnaker a9d3360701 Remove test dependency on GlobalTracer 2019-10-24 20:53:14 -07:00
Trask Stalnaker d45b571996 Remove unused code 2019-10-24 20:53:13 -07:00
Tyler Benson a8ca47ed03 Skip spring controller and dropwizard trace if no trace present
Also prefer early return instead of deep nesting for null check.
2019-10-24 14:40:08 -07:00
Tyler Benson 079dfd24bd ES deploy workaround. 2019-10-23 14:09:01 -07:00
Tyler Benson fbd16d8cb7 Add assert to ensure muzzle range not empty and update spring-data
Also fix a few muzzle definitions that are now broken with the new requirement.

Moved a few projects around to match correct version numbers.
2019-10-23 14:09:01 -07:00
Tyler Benson 7db4602253 Fix jax-rs-client minimum supported version
Can’t be completely sure since many of these versions don’t show up in a maven range query used by muzzle.
2019-10-23 14:02:04 -07:00
Tyler Benson 29f7288954 Merge pull request #1020 from trask/agent-api
Integration API to decouple from OpenTracing
2019-10-23 14:01:18 -07:00
Trask Stalnaker 30367c79cf Split up MessagePropertyTextMap 2019-10-21 18:46:58 -07:00
Trask Stalnaker 0107551c0e Remove outdated comment 2019-10-21 18:36:14 -07:00
Trask Stalnaker 8bb0f2c2f0 Use header objects directly where possible 2019-10-21 18:21:01 -07:00
Trask Stalnaker cc31c5a505 Remove unused code 2019-10-21 16:59:43 -07:00
Trask Stalnaker f6d2c1c1ef Fix two beforeFinish() calls 2019-10-21 16:59:36 -07:00
Trask Stalnaker b0c5b2cd78 Remove deprecated methods 2019-10-19 16:52:43 -07:00
Trask Stalnaker 299c396eab Update testing module to new agent api 2019-10-19 16:52:43 -07:00
Trask Stalnaker 41185662df Update twilio to new agent api 2019-10-19 16:52:43 -07:00
Trask Stalnaker 377df7b789 Update trace-annotation to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 05e6544ded Update spymemcached-2.12 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker f0c29adb61 Update spring-webflux to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 51fe9f48b9 Update spring-web to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 7775c1e132 Update spring-data-1.9 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 9b14f7198f Update sparkjava-2.3 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker a5c54c54f7 Update servlet-3 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 4a2517a7d3 Update servlet-2 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 7cb209bfa1 Update rxjava-1 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 4e4a9c9bb7 Update reactor-core-3.1 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 9775ae5b2f Update ratpack-1.4 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 462a6632f7 Update rabbitmq-amqp-2.7 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 7460c32248 Update play-2.6 to new agent api 2019-10-19 16:52:42 -07:00
Trask Stalnaker 4691396d11 Update play-2.4 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 9d51a80eae Update okhttp-3 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 6a7bafe389 Update netty-4.1 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker bb500f9c54 Update netty-4.0 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker b576c394af Update mongo to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 95f91f89ba Update lettuce-5 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 5f0a2ae6b4 Update kafka-streams-0.11 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 7259e288ff Update kafka-clients-0.11 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker b53652303c Update jsp-2.3 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 6b23ffbae8 Update jms to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker b3a86085cb Update jetty-8 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 1e81929aa8 Update jedis-1.4 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 308409f856 Update jdbc to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker 769873bb71 Update jax-rs-client-2.0 to new agent api 2019-10-19 16:52:41 -07:00
Trask Stalnaker b1f48185fa Update jax-rs-client-1.9 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 5ce96d905b Update jax-rs-annotations-2 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 244dc6996e Update jax-rs-annotations-1 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 7c954ecc0c Update java-concurrent to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker e7bfbf80bb Update hystrix-1.4 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 45e8b7fdc5 Update http-url-connection to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker d3c83419f9 Update hibernate to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 50dcc5bd4e Update grpc-1.5 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 74fda2e198 Update grizzly-2 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 120937d175 Update google-http-client to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 9775a94132 Update elasticsearch to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 4ca63b7440 Update dropwizard to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 44f06ed3b5 Update datastax-cassandra-3 to new agent api 2019-10-19 16:52:40 -07:00
Trask Stalnaker 2c7609f7d7 Update couchbase-2.6 to new agent api 2019-10-19 16:52:40 -07:00