Commit Graph

1610 Commits

Author SHA1 Message Date
Tyler Benson 38cc03ae9e Misc fixes 2019-08-06 08:11:37 -07:00
Tyler Benson 668b1059f5 Migrate vertx tests to HttpServerTest 2019-08-05 15:52:04 -07:00
Tyler Benson c5ccc67743 Migrate Akka-Http Server tests and add ignoreParent() 2019-08-05 08:42:46 -07:00
Tyler Benson c60e1dbcba Set ignoreActiveSpan for Servlet 2 and capture status code
This change wraps the servlet response object in order to collect the status code.  This can be risky if the code is expecting a raw type object.  We are extending a standard “HttpServletResponseWrapper” though, so it should be easy to work around.

This change also moves to the standard HttpServerTest for Servlet 2.
2019-08-05 08:42:46 -07:00
Tyler Benson 2aa69d8203
Merge pull request #932 from DataDog/tyler/servlet-testing
Migrate servlet tests to HttpServerTest and ignoreActiveSpan for "root"
2019-08-05 08:35:48 -07:00
Tyler Benson 6f229305bb Review fixes 2019-08-02 10:01:03 -07:00
Luca Abbati 097c8186ba
Merge pull request #906 from DataDog/labbati/atlas-1.1.0-compatibility
Make netty 4.0 attributes definition compatible with Apache Atlas 1.1.0
2019-08-02 16:27:23 +02:00
Tyler Benson 9681b91f3e Fix test. Format. 2019-07-29 15:27:26 -07:00
Tyler Benson d6b903665e Copy servlet listener over to new context on dispatch.
This allows it to finish the span with the correct response.
2019-07-26 16:30:23 -07:00
Tyler Benson c3203dace8 Migrate servlet tests to HttpServerTest
Currently missing the authentication tests which need to be added to the parent, but other than that, testing is more thorough.

Discovered that trace propagation for Jetty Async is currently busted so I commented that portion of the test out until we can get it fixed.
2019-07-26 16:01:06 -07:00
Tyler Benson 023fb397b5
Merge pull request #928 from DataDog/tyler/http-server-testing
Base HttpServerTest and updated Netty test
2019-07-26 12:59:49 -07:00
Luca Abbati 8609a07eaf
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/atlas-1.1.0-compatibility 2019-07-26 11:23:06 +02:00
Tyler Benson 0d1bf5edd7 Limit Vert.x tests to 3.x
4.0.0-milestone1 was just released and is incompatible.
2019-07-25 15:32:54 -07:00
Tyler Benson c1ec277944 Base HttpServerTest and updated Netty test 2019-07-24 15:54:07 -07:00
Tyler Benson aaba3fc095 Fix trace propagation 2019-07-22 11:02:24 -07:00
Johan Vandeweerd fff8006e51 Remove unused private method 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 0043efa164 Add documentation on conditions when DefaultWebClientAdvice is not applied 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 633db43cb1 Fix typo rawStatusCode in javadoc 2019-07-22 11:01:41 -07:00
Johan Vandeweerd bc51f04bd3 Replace hasSuperType with safeHasSuperType 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 8f96205579 Add Javadoc to rawStatusCode method that is not part of ClientResponse in spring-webflux-5.0 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 7059cca3cc Add test for spring webflux webclient 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 872a099722 Remove onPeerConnection decorator call 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 23b8caa27c Add decorator hooks during lifecycle of Publisher 2019-07-22 11:01:41 -07:00
Johan Vandeweerd ac11bba616 Replace operation name with static value 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 35b924b397 Replace span.log with span.tag 2019-07-22 11:01:41 -07:00
Johan Vandeweerd f5f8fe1c96 Add javadoc to clarify usage of this class 2019-07-22 11:01:41 -07:00
Johan Vandeweerd e4560ba50f Instrument all subtypes of ExchangeFunction instead of only ExchangeFunctions$DefaultExchangeFunction 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 0e9edb1205 Aligned instrumentation names between DefaultWebClientInstrumentation and SpringWebfluxHttpClientDecorator 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 091648d4c7 Enable tracing for Spring Webflux WebClient 2019-07-22 11:01:41 -07:00
Johan Vandeweerd 797003b585 Moved Spring Webflux instrumentation code to server subpackage 2019-07-22 11:01:41 -07:00
Tyler Benson 7571b778ad
Merge pull request #886 from DataDog/tyler/netty-client-callback
Change the scope for the netty client callback
2019-07-22 11:00:17 -07:00
Luca Abbati 0ff56b0a9f
Improve tests readability moving common instance to test class 2019-07-22 11:19:13 +02:00
Luca Abbati 3817e76130
Apply doubled-check locking + same approach to attributes definition for netty-4.1 2019-07-22 11:15:33 +02:00
Laplie Anderson 22dc30526a
Merge pull request #925 from DataDog/landerson/resourcename-on-annotation
Add resource name to the @Trace annotation
2019-07-19 12:43:19 -04:00
Tyler Benson ea4fc4ab28 Use NoopSpan instead of null for null parent.
Fix some more tests.
2019-07-19 09:26:40 -07:00
Tyler Benson e692605a3b Fix formatting 2019-07-19 09:26:40 -07:00
Tyler Benson 53ef8f020f Additional testing for Vert.x
Adds reactive/circuitbreaker tests.
2019-07-19 09:26:40 -07:00
Tyler Benson 0e83304a87 Update Ratpack latest test 2019-07-19 09:26:40 -07:00
Tyler Benson 6ccb0d71d8 Change the scope for the netty client callback
Previously the scope was the http client span, which could result in deep nesting.  Now it is the parent span.

Before
[——————Parent—————]
   [ ^ ———Client—————]
                        [ ^—Child—]

Now:
[——————Parent—————]
   [ ^ —Client—] [ ^—Child—]

Also improve the tests.
2019-07-19 09:26:40 -07:00
Laplie Anderson cad2a3d4a4 Set resource name in a way that doesn't need to reference DDSpanBuilder 2019-07-19 12:26:17 -04:00
Luca Abbati 5921ed3ed1
Remove code not intended to be there 2019-07-19 18:14:48 +02:00
Laplie Anderson d101bea085 Add DDSpanBuilder to helper classes of both instrumentations 2019-07-19 12:11:10 -04:00
Pedro Silva ef5a006df2 changes requested: remove iterator() implementation from TracingList. refactor unit tests to expect only one element to be consumed. Kafka embedded instance as a Rule 2019-07-19 16:45:34 +01:00
Luca Abbati 9f0ec7ec49
Update helper classes 2019-07-19 17:24:58 +02:00
Luca Abbati 95a963a364
Fix build with additional WeakHash map implementation 2019-07-19 17:05:40 +02:00
Luca Abbati edacd7a41d
Refactor weak hash map to be able to reuse functionalities 2019-07-19 16:18:38 +02:00
Laplie Anderson 331b8c8e99 Add resource name to the @Trace annotation 2019-07-19 09:52:19 -04:00
Pedro Silva 2627a452c0 unit tests for records(TopicPartition) method of kafka-clients instrumentation. introduce safeguards when instrumenting iterator() so that duplication of traces is not allowed. do not allow subList() to be instrumented 2019-07-18 23:09:33 +01:00
Luca Abbati 35b928be7c
Refactor ClassLoaderScopeWekaMap 2019-07-18 15:34:26 +02:00
Nikolay Martynov 05af20d29c
Merge pull request #921 from DataDog/mar-kolya/fix-javadoc
Minor javadoc fix
2019-07-18 09:03:37 -04:00