473aca7c08
Merge pull request #948 from DataDog/tyler/grizzly
...
Add instrumentation and tests for Grizzly 2.x Http Server
2019-08-16 09:06:58 -07:00
20277f5f4a
Minor CR fixes.
2019-08-16 08:47:52 -07:00
b69f9ea041
Enable async propagation for grpc client callbacks.
2019-08-15 17:12:32 -07:00
63cd73e79e
Remove obsolete check
...
We are no longer using UrlConnection to send traces
2019-08-14 16:46:31 -04:00
b0ff861392
Do not trace openConnection for Datadog ClassLoader
2019-08-14 16:46:23 -04:00
ca040ab0dd
Update JMXFetch to 0.30.1
2019-08-14 11:27:30 -07:00
f5b73260ed
Add instrumentation and tests for Grizzly 2.x Http Server
2019-08-13 16:05:11 -07:00
ab623ab7b4
Merge pull request #942 from DataDog/tyler/http-server-testing
...
Jetty 8 test migration and ignoreParent
2019-08-13 13:07:18 -07:00
bbfd02befc
Update Jackson to 2.9.9.3
...
As recommended by https://nvd.nist.gov/vuln/detail/CVE-2019-14379
(Remove unused dependency)
2019-08-12 16:41:57 -07:00
2d08464be3
Fixes
2019-08-07 10:48:14 -07:00
6dd729b843
Jetty 8: ignore parent and move to HttpServerTest
...
This method of using jetty doesn’t seem to work with Servlet’s Async. Native Jetty uses Continuations which we don’t support and should investigate instrumenting.
2019-08-07 09:35:04 -07:00
49249c0c6e
Move server field to HttpServerTest
2019-08-07 08:35:18 -07:00
f3e9fa22ef
Add HttpServerTest for redirects
2019-08-07 08:35:18 -07:00
548e4ed6e4
Merge pull request #934 from DataDog/landerson/remove-temp-jars
...
Eliminate temporary jars for instrumentation, jmxfetch, and bootstrap
2019-08-06 18:32:41 -04:00
1cfa847081
Merge pull request #941 from DataDog/tyler/common-deps
...
Remove common (redundant) dependencies
2019-08-06 15:29:14 -07:00
95a294a560
Remove common (redundant) dependencies
2019-08-06 14:51:04 -07:00
efd0e5fb18
muzzle fix
2019-08-06 16:26:43 -04:00
7b023ca95a
Always use reflection to get VM args
2019-08-06 16:12:43 -04:00
d77487017e
muzzle fix
2019-08-06 08:58:36 -07:00
38cc03ae9e
Misc fixes
2019-08-06 08:11:37 -07:00
668b1059f5
Migrate vertx tests to HttpServerTest
2019-08-05 15:52:04 -07:00
ff0cd73381
Getting the -javaagent parameter is necessary in some cases
2019-08-05 13:53:38 -04:00
1a26e73ae8
Some tests need the agent jar loaded as an agent
2019-08-05 12:20:19 -04:00
ba6ff678db
Change agent jar inclusion in tests that launch a process
...
The tests were the main problem. By using a different approach to pass in the agent jar, the TracingAgent code can be much simpler
2019-08-05 12:06:43 -04:00
c5ccc67743
Migrate Akka-Http Server tests and add ignoreParent()
2019-08-05 08:42:46 -07:00
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
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
a9d0d2cbbe
Use CodeSource instead of javaagent arg
...
Check both TracingAgent.class and DatadogClassloader.class for code source
2019-08-05 10:41:05 -04:00
8d41e60182
Simple test to check loading of bootstrap in a launched vm
2019-08-02 15:39:36 -04:00
6f229305bb
Review fixes
2019-08-02 10:01:03 -07:00
1381e718fe
More complicated logic to reflectively get VM args on different jdks
...
Support the differences between IBM and Oracle jdks along with differences between 8 and 12
2019-08-02 10:27:45 -04:00
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
a6ba2d25fe
A more reliable way to get the agent jar without breaking logging
2019-08-01 12:45:17 -04:00
21b12328fa
OSGI bootstrap delegation
2019-07-31 11:32:20 -04:00
e8e4f2649b
Bootstrap prefixes need to be in *3* places
2019-07-31 10:41:42 -04:00
5c73935178
Bootstrap prefixes need to be in 2 places
2019-07-30 21:05:38 -04:00
273feafa94
Use the bootstrapProxy to load jars. Better bootstrap url algo
2019-07-30 19:50:16 -04:00
cf98110991
JMXFetch loading threw permission errors
2019-07-30 16:56:49 -04:00
c41536cbe2
Fix failing tests
...
Add TracingAgent to list of bootstrap class
Fix renaming tests
Fix JMXFetch path splitting
2019-07-30 15:27:47 -04:00
9681b91f3e
Fix test. Format.
2019-07-29 15:27:26 -07:00
c275143eae
Shadow the bootstrap jar into the main agent jar
2019-07-29 17:01:55 -04:00
a1f8cad2e8
Tooling and jmxfetch temp jars removed
...
Enhanced the DatadogClassloader to work with jars inside other jars. No need to create the jars in a temp directory anymore
2019-07-29 17:01:55 -04:00
7e1266b39f
Use try with resources to read agent version
...
More compact and gets rid of warnings
2019-07-29 17:01:55 -04:00
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
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
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
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
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
c1ec277944
Base HttpServerTest and updated Netty test
2019-07-24 15:54:07 -07:00
aaba3fc095
Fix trace propagation
2019-07-22 11:02:24 -07:00
fff8006e51
Remove unused private method
2019-07-22 11:01:41 -07:00
0043efa164
Add documentation on conditions when DefaultWebClientAdvice is not applied
2019-07-22 11:01:41 -07:00
633db43cb1
Fix typo rawStatusCode in javadoc
2019-07-22 11:01:41 -07:00
bc51f04bd3
Replace hasSuperType with safeHasSuperType
2019-07-22 11:01:41 -07:00
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
7059cca3cc
Add test for spring webflux webclient
2019-07-22 11:01:41 -07:00
872a099722
Remove onPeerConnection decorator call
2019-07-22 11:01:41 -07:00
23b8caa27c
Add decorator hooks during lifecycle of Publisher
2019-07-22 11:01:41 -07:00
ac11bba616
Replace operation name with static value
2019-07-22 11:01:41 -07:00
35b924b397
Replace span.log with span.tag
2019-07-22 11:01:41 -07:00
f5f8fe1c96
Add javadoc to clarify usage of this class
2019-07-22 11:01:41 -07:00
e4560ba50f
Instrument all subtypes of ExchangeFunction instead of only ExchangeFunctions$DefaultExchangeFunction
2019-07-22 11:01:41 -07:00
0e9edb1205
Aligned instrumentation names between DefaultWebClientInstrumentation and SpringWebfluxHttpClientDecorator
2019-07-22 11:01:41 -07:00
091648d4c7
Enable tracing for Spring Webflux WebClient
2019-07-22 11:01:41 -07:00
797003b585
Moved Spring Webflux instrumentation code to server subpackage
2019-07-22 11:01:41 -07:00
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
0ff56b0a9f
Improve tests readability moving common instance to test class
2019-07-22 11:19:13 +02:00
3817e76130
Apply doubled-check locking + same approach to attributes definition for netty-4.1
2019-07-22 11:15:33 +02:00
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
ea4fc4ab28
Use NoopSpan instead of null for null parent.
...
Fix some more tests.
2019-07-19 09:26:40 -07:00
e692605a3b
Fix formatting
2019-07-19 09:26:40 -07:00
53ef8f020f
Additional testing for Vert.x
...
Adds reactive/circuitbreaker tests.
2019-07-19 09:26:40 -07:00
0e83304a87
Update Ratpack latest test
2019-07-19 09:26:40 -07:00
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
cad2a3d4a4
Set resource name in a way that doesn't need to reference DDSpanBuilder
2019-07-19 12:26:17 -04:00
5921ed3ed1
Remove code not intended to be there
2019-07-19 18:14:48 +02:00
d101bea085
Add DDSpanBuilder to helper classes of both instrumentations
2019-07-19 12:11:10 -04:00
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
9f0ec7ec49
Update helper classes
2019-07-19 17:24:58 +02:00
95a963a364
Fix build with additional WeakHash map implementation
2019-07-19 17:05:40 +02:00
edacd7a41d
Refactor weak hash map to be able to reuse functionalities
2019-07-19 16:18:38 +02:00
331b8c8e99
Add resource name to the @Trace annotation
2019-07-19 09:52:19 -04:00
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
35b928be7c
Refactor ClassLoaderScopeWekaMap
2019-07-18 15:34:26 +02:00
05af20d29c
Merge pull request #921 from DataDog/mar-kolya/fix-javadoc
...
Minor javadoc fix
2019-07-18 09:03:37 -04:00
ab7786d352
Minor javadoc fix
2019-07-17 16:58:29 -04:00
0f9b28df27
Merge pull request #914 from DataDog/landerson/google-http-client
...
Instrumentation of Google Http Client
2019-07-17 16:17:38 -04:00
e3a6d40e77
Add tests for ClassLoaderScoperWeakMap
2019-07-17 12:46:24 +02:00
48aff5f754
Add all helpers required for ClassLoaderScopedWeakMap usage + re-enable all tests
2019-07-17 09:49:26 +02:00
840b8b407d
No matter what, it won't work :) I am now in the mood 'try everything in the world until it works'
2019-07-16 15:39:00 +02:00
cb430c566b
Remove obsolete test
2019-07-16 11:53:22 +02:00
bfa5712c04
Add comments to ClassLoader scoped weak map
2019-07-16 11:02:26 +02:00
de6f33c035
Draft of per-classloader netty AttributeKey definition
2019-07-16 11:02:25 +02:00
fac3a93445
Make netty 4.0 attributes definition compatible with Apache Atlas 1.1.0
...
The issue we are trying to fix here seems to be a result of two concurrent issues.
Cassandra driver's used by atlas 1.1.0 brings in a old version of netty < 4.0.23.
In version 4.0.25 netty raised exception in `UniqueName` class for duplicate name
```
if (map.putIfAbsent(name, Boolean.TRUE) != null) {
throw new IllegalArgumentException(String.format("'%s' is already in use", name));
}
```
This changed in 4.0.26 where exception was not thrown, instead the duplicate key was just ignored.
```
protected UniqueName(String name) {
this.name = checkNotNull(name, "name");
id = nextId.incrementAndGet();
}
```
Now this alone would not be enough. The only way I was able to reproduce is if two different class loaders tries to load the
same class `AttributeKeys` twice.
I tried to look into Atlas source code (which is huge) and I could not find a clear path of how this would be possible.
Further more, looking at some build scripts that a user experiencing this issue provided,
it looks like they are doing everything correctly and there is nothing they should change.
In conclusion, I believe that even if this is not a very clean approach,
we should be resilient to this use case, when a customer using netty <4.0.25 in an
older version of Apache Atlas (or with some sort of class loader behavior).
2019-07-16 11:02:25 +02:00
747f758a70
Remove default instance
...
It’s not very interesting and breaks the definition of “instance” when we want to see the db name when no instance name is defined.
2019-07-15 12:52:57 -07:00
1fbe395586
Avoid Jetty 10 in servlet-3 test
...
Alpha version of Jetty 10 was released and it seems to be compiled for
java versions above 8 so tests fail on java8.
Limit latest dep Jetty tests to Jetty 9 for now.
2019-07-15 10:15:21 -04:00
3191eb7058
Avoid Jetty 10
...
Alpha version of Jetty 10 was released and it seems to be compiled for
java versions above 8 so tests fail on java8.
Limit latest dep Jetty tests to Jetty 9 for now.
2019-07-15 10:15:16 -04:00
5b3d4b8e35
Merge pull request #905 from DataDog/labbati/jmx-as-daemon
...
Run JmxFetch app as a daemon
2019-07-15 08:18:09 -04:00
ec931463a4
Merge pull request #885 from DataDog/tyler/instance-name-testing
...
Additional testing for split-by-instance config
2019-07-15 01:27:49 -04:00
0eab4688cd
Remove unnecessary semicolons
2019-07-12 16:36:02 -04:00
6516bd7ad7
Minor comment update
2019-07-12 16:26:39 -04:00
8a7336a017
Use 1.19.0 as first supported version
2019-07-12 16:06:19 -04:00
82ee01cadf
Implement instrumentation for async requests
2019-07-12 15:41:14 -04:00
f4aa8be7c5
Make kafka streams test more stable
2019-07-11 11:07:17 -04:00
3ecc7c123d
Wait for traces in kafka streams tests
2019-07-11 10:51:55 -04:00
765b76b0ae
Fix kafka-streaming tests broken by records(TopicPartition) instrumentation
2019-07-11 10:31:18 -04:00
3e8b65290a
Instrument records(TopicPartition) in kafka consumer
2019-07-11 10:30:44 -04:00
142477ed0a
Merge branch 'master' into mar-kolya/kafka-trace-records
2019-07-10 18:15:51 -04:00
a13e4a0229
Merge pull request #910 from DataDog/labbati/jersey-1.19
...
Extend support for Jersey client to 1.9+
2019-07-10 15:02:11 -06:00
4501dbe920
Merge pull request #899 from dpratt/fix-akka-http
...
Fix akka-http instrumentation.
2019-07-10 14:39:47 -06:00
5624cef4af
fix check
2019-07-10 14:08:50 -06:00
4486c3a6ff
Change jax-rs-client project names to match versions
2019-07-10 13:25:48 -06:00
5526fd0ca3
Jersey client 1.9 cleanup
2019-07-10 13:11:09 -06:00
f484295460
Kafka instrumentation: make return type more general in instrumentation matching
2019-07-10 13:47:20 -04:00
c16a0844d8
Enable tracing of jax-rs client in sun package
2019-07-10 13:05:12 -04:00
3ab63e7005
Some refactoring in tests
2019-07-10 08:43:31 -04:00
0f5dd2413c
Add tests for Jersey V1 client
2019-07-09 22:49:44 -04:00
b62266fd52
First draft of jersey 1.19 client instrumentation
2019-07-09 21:13:00 -04:00
caa7e4426a
Passing tests. Modify escaping of spaces in urls
2019-07-09 17:17:41 -04:00
d97b1c2d53
Fix package
2019-07-09 17:17:41 -04:00
30916ac5d7
Implementation
2019-07-09 17:17:41 -04:00
f53b14bd0f
Stub google http client integration
2019-07-09 17:17:41 -04:00
2e41e94774
Update jmxfetch to version 0.30.0
2019-07-08 14:43:29 -04:00
058c4ec567
Trace 'records(TopicPartitions)` in kafka consumer
2019-07-08 11:19:17 -04:00
2027027e46
Explitely run JmxFetch app as a daemon
2019-07-03 15:24:51 +02:00
ffe4aabf8f
Specify version of hibernate-annotation
...
Using '+' pushes version of hibernate-core up as well and we do not
want thay.
2019-07-02 10:41:55 -04:00
94b2e91c3a
Fix hibernate DTD urls
...
Looks like old urls redirect to https with broken cert now
2019-07-02 10:41:32 -04:00
58da60ac4e
Fix typo in comment
2019-06-25 00:33:18 +02:00
681420a004
Remove SuperPool instrumentation.
...
By definition, a Flow generated by a SuperPool does not respect ordering
of requests and responses, and in fact will typically only rarely actually
behave in the fashion that the instrumentation expects. The previous implementation
would start a span for a given request before submitting it as input to the flow,
and close the span with whatever response is next emitted by the flow. This
request will rarely (if ever) be the actual response for the request that
started the span. For more info, see the official docs at
https://doc.akka.io/docs/akka-http/current/client-side/host-level.html#configuring-a-host-connection-pool
Additionally, compiling this instumentation against scala 2.11, and only
scala 2.11 can (and does) cause significant problems at runtime due to the
fact that Scala is explicitly not binary compatible across major versions.
2019-06-24 11:01:48 -05:00
8022d0e170
Remove redundant .class suffixes in groovy test files
2019-06-24 17:18:05 +02:00
d58c252085
Add tests for netty channel handlers added through channel initializers
2019-06-24 16:27:50 +02:00
27e0e4492e
Calculate depth per handler class in netty channel pipeline instrumentation
2019-06-24 16:27:50 +02:00
f01d473d10
Merge pull request #894 from DataDog/labbati/log4j
...
Support log trace injection for log4j 1.x and log4j 2.x when used without Slf4j
2019-06-21 16:36:26 -04:00
8ee6d26d15
Rename log4j 1 and 2 instrumentation to log4j1 and log4j2 respectively
2019-06-21 15:56:27 -04:00
f279a612f7
Minor fixes to typos and code styles
2019-06-21 15:53:13 -04:00
ac7abcdfa8
Fix expression to include tracing of log4j1 MDC in agent installer
2019-06-21 15:52:20 -04:00
2e66aea741
Fix formatting issue
2019-06-21 15:52:01 -04:00
bf7bbf31f8
Fix akka-http instrumentation.
...
Remove compiled Scala artifacts from the actual instrumentation. Scala
is not binary compatible across major versions, and having
AkkaHttpClientTransformFlow.scala be in the artifact causes problems
when using anything but Scala 2.11.
Having the AkkaHttpClientTransformFlow implementation be in pure java
utilizing the Akka-stream Java DSL ensures that this will work across
any given Scala major version.
2019-06-21 14:51:04 -05:00
ad822d81f9
Fix imports to match project style
...
* imports in groovy and the ordering of lombok was incorrect
2019-06-21 14:19:45 -04:00
d80406843f
Add "http.query.string" and "http.fragment.string" to DDTags
2019-06-21 14:05:34 -04:00
d0f17e4b9d
Rename log context injection test base
2019-06-21 08:54:13 -04:00
0916a00a5e
Fixed unnecessary semi-colon in groovy class
2019-06-20 21:42:50 -04:00
27b4db8861
Remove legacy transitive dependencies no longer bundled with the JVM from muzzle tests
2019-06-20 21:29:46 -04:00
cba8ba1221
Refactor classes of log injection services to improve readability
2019-06-20 18:38:00 -04:00
b7393df473
Remove jms functionality brought in by log4j1.X dependency
2019-06-20 18:23:40 -04:00
4d1d5d1012
Introduce the mandatory test suite that a supported logging library MUST satisfy for log injection
2019-06-20 18:15:19 -04:00
c2bd5eefa0
Remove method that was copied and pasted from slf4j instrumentation but seems not to be relevant here
2019-06-20 17:55:43 -04:00
ecdf6664ef
Refactor log4jX instrumentations
2019-06-20 17:36:10 -04:00
34d589e536
Create a reusable log context listener to be used for slf4j, log4j1 and log4j2
2019-06-20 17:07:28 -04:00
dcf0f57030
Add support for log4j 1.x
2019-06-20 16:08:49 -04:00
Tyler Benson
Nikolay Martynov
Laplie Anderson
Laplie Anderson
Luca Abbati
Johan Vandeweerd
Pedro Silva
David Pratt