Tyler Benson
5624cef4af
fix check
2019-07-10 14:08:50 -06:00
Tyler Benson
4486c3a6ff
Change jax-rs-client project names to match versions
2019-07-10 13:25:48 -06:00
Tyler Benson
5526fd0ca3
Jersey client 1.9 cleanup
2019-07-10 13:11:09 -06:00
Nikolay Martynov
f484295460
Kafka instrumentation: make return type more general in instrumentation matching
2019-07-10 13:47:20 -04:00
Luca Abbati
c16a0844d8
Enable tracing of jax-rs client in sun package
2019-07-10 13:05:12 -04:00
Luca Abbati
3ab63e7005
Some refactoring in tests
2019-07-10 08:43:31 -04:00
Luca Abbati
0f5dd2413c
Add tests for Jersey V1 client
2019-07-09 22:49:44 -04:00
Luca Abbati
b62266fd52
First draft of jersey 1.19 client instrumentation
2019-07-09 21:13:00 -04:00
Laplie Anderson
caa7e4426a
Passing tests. Modify escaping of spaces in urls
2019-07-09 17:17:41 -04:00
Laplie Anderson
d97b1c2d53
Fix package
2019-07-09 17:17:41 -04:00
Laplie Anderson
30916ac5d7
Implementation
2019-07-09 17:17:41 -04:00
Laplie Anderson
f53b14bd0f
Stub google http client integration
2019-07-09 17:17:41 -04:00
Luca Abbati
2e41e94774
Update jmxfetch to version 0.30.0
2019-07-08 14:43:29 -04:00
Nikolay Martynov
058c4ec567
Trace 'records(TopicPartitions)` in kafka consumer
2019-07-08 11:19:17 -04:00
Luca Abbati
2027027e46
Explitely run JmxFetch app as a daemon
2019-07-03 15:24:51 +02:00
Nikolay Martynov
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
Nikolay Martynov
94b2e91c3a
Fix hibernate DTD urls
...
Looks like old urls redirect to https with broken cert now
2019-07-02 10:41:32 -04:00
Luca Abbati
58da60ac4e
Fix typo in comment
2019-06-25 00:33:18 +02:00
David Pratt
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
Luca Abbati
8022d0e170
Remove redundant .class suffixes in groovy test files
2019-06-24 17:18:05 +02:00
Luca Abbati
d58c252085
Add tests for netty channel handlers added through channel initializers
2019-06-24 16:27:50 +02:00
Luca Abbati
27e0e4492e
Calculate depth per handler class in netty channel pipeline instrumentation
2019-06-24 16:27:50 +02:00
Luca Abbati
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
Luca Abbati
8ee6d26d15
Rename log4j 1 and 2 instrumentation to log4j1 and log4j2 respectively
2019-06-21 15:56:27 -04:00
Luca Abbati
f279a612f7
Minor fixes to typos and code styles
2019-06-21 15:53:13 -04:00
Luca Abbati
ac7abcdfa8
Fix expression to include tracing of log4j1 MDC in agent installer
2019-06-21 15:52:20 -04:00
Laplie Anderson
2e66aea741
Fix formatting issue
2019-06-21 15:52:01 -04:00
David Pratt
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
Laplie Anderson
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
Laplie Anderson
d80406843f
Add "http.query.string" and "http.fragment.string" to DDTags
2019-06-21 14:05:34 -04:00
Luca Abbati
d0f17e4b9d
Rename log context injection test base
2019-06-21 08:54:13 -04:00
Luca Abbati
0916a00a5e
Fixed unnecessary semi-colon in groovy class
2019-06-20 21:42:50 -04:00
Luca Abbati
27b4db8861
Remove legacy transitive dependencies no longer bundled with the JVM from muzzle tests
2019-06-20 21:29:46 -04:00
Luca Abbati
cba8ba1221
Refactor classes of log injection services to improve readability
2019-06-20 18:38:00 -04:00
Luca Abbati
b7393df473
Remove jms functionality brought in by log4j1.X dependency
2019-06-20 18:23:40 -04:00
Luca Abbati
4d1d5d1012
Introduce the mandatory test suite that a supported logging library MUST satisfy for log injection
2019-06-20 18:15:19 -04:00
Luca Abbati
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
Luca Abbati
ecdf6664ef
Refactor log4jX instrumentations
2019-06-20 17:36:10 -04:00
Luca Abbati
34d589e536
Create a reusable log context listener to be used for slf4j, log4j1 and log4j2
2019-06-20 17:07:28 -04:00
Luca Abbati
dcf0f57030
Add support for log4j 1.x
2019-06-20 16:08:49 -04:00
Luca Abbati
8d562f91fd
Rename log4j package removing the left-over from sl4j original class
2019-06-19 12:35:22 -04:00
Luca Abbati
d9eb480f3c
Rename log4j2 module to reflect library name
2019-06-19 12:35:22 -04:00
Luca Abbati
22477efb7a
Add basic support for log4j ThreadContext for log injection.
2019-06-19 12:34:39 -04:00
Nikolay Martynov
a9a623d1dc
Configure system logger to log timestamp
...
Also add an 'identifying marker' to tracing log lines so we could
potentially automatically parse them.
2019-06-17 12:56:19 -04:00
Tyler Benson
2c240754fc
Additional testing for split-by-instance config
...
Some DB’s don’t define an instance, so verify the setting has no effect for them.
2019-06-14 10:08:17 -07:00
Tyler Benson
e8246f6b97
Merge pull request #881 from DataDog/tyler/instance-name
...
Add `dd.trace.db.client.split-by-instance` Config
2019-06-14 08:40:52 -07:00
Tyler Benson
3ce3c7c8c5
Merge pull request #882 from DataDog/tyler/cassandra-testing
...
Update Cassandra Tests and more instance name cleanup
2019-06-14 08:02:21 -07:00
Tyler Benson
a4d53b0dcd
Update Cassandra Tests and more instance name cleanup
2019-06-13 15:55:40 -07:00
Tyler Benson
4c5793bddf
Add `dd.trace.db.client.split-by-instance` Config
2019-06-13 15:52:37 -07:00
Tyler Benson
7e2f85d674
Fix latest test
2019-06-13 14:54:41 -07:00
Tyler Benson
3be6868981
Update Mongo instance name and remove memcache instance name
...
For mongo, use description if set, fallback to db name.
Memcache doesn’t have a good “instance name” that would work as service name, so clear it out for now.
2019-06-13 12:35:16 -07:00
Tyler Benson
75b626a84d
fix tests
2019-06-13 10:59:36 -07:00
Tyler Benson
25305444d4
Set minimum version and fix var name.
2019-06-13 10:44:42 -07:00
Tyler Benson
d26edd6c17
Ensure gradle runs base mongo test first
...
Otherwise there is a race condition between the projects initializing the mongo instance.
2019-06-13 10:44:42 -07:00
Tyler Benson
d6719ed5cd
Replace Mongo tests with updated tests.
2019-06-13 10:44:42 -07:00
Nikolay Martynov
b112043ea3
Merge pull request #876 from DataDog/mar-kolya/make-akka-test-more-stable
...
Make Akka client test more stable
2019-06-13 13:23:59 -04:00
Luca Abbati
075b30053d
Merge pull request #863 from DataDog/labbati/non-static-config
...
Avoid usage of static getters when accessing configuration parameters
2019-06-13 18:06:15 +02:00
Nikolay Martynov
f5f3386f79
Make Akka client test more stable
...
We already have a hack to wait for client span to close after the
request because it is closed on separate thread. This patch extends
that hack to handle cases when original request throws an exception.
2019-06-13 11:51:10 -04:00
Tyler Benson
ec3b586c2f
Merge pull request #866 from DataDog/tyler/jdbc-instance
...
Attempt to properly parse out instance name from JDBC url
2019-06-13 08:15:02 -07:00
Luca Abbati
bd1e9a01db
Fixed missing blank line
2019-06-13 14:34:27 +02:00
Luca Abbati
a8dd35ef57
Improve AgentRunner and ConfigUtils class based on CR comments
2019-06-13 12:40:10 +02:00
Luca Abbati
a522196b49
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/non-static-config
2019-06-12 23:57:20 +02:00
Luca Abbati
e1ceda8f0e
Improve config usage as instance based on CR
2019-06-12 14:00:36 +02:00
Nikolay Martynov
6d5972bce1
Make agent-tooling compile-depend on dd-tracing-ot directly
...
This ensures that `dd-tracng-ot` gets included into shadow jar.
Before this patch it was included only 'by accident' via some
transitive dependencies of some instrumentations.
2019-06-11 14:49:44 -04:00
Tyler Benson
3c68c09101
Review fixes.
2019-06-11 11:12:50 -07:00
Tyler Benson
1a5a70650c
Fix SpringJpaTest
2019-06-10 17:18:58 -07:00
Tyler Benson
4469c7fb11
separate out driver subtype
...
to avoid changing existing service names
2019-06-10 16:17:36 -07:00
Tyler Benson
288add2a60
Fix slickdb test
2019-06-10 15:20:56 -07:00
Tyler Benson
0807598d16
Populate settings from properties and add MariaDB alt styles
2019-06-10 12:02:14 -07:00
Nikolay Martynov
8fa14ad33e
Remove DDJavaAgentInfo - it doesn't seem to be used
2019-06-07 22:56:32 -04:00
Nikolay Martynov
78d014cf91
Fix DDInfoTest
...
This test was not marked as `Specification` and therefor was not run
during builds. Some time ago some code got moved around and this test
got broken - so fixing it.
2019-06-07 22:56:32 -04:00
Nikolay Martynov
f172d59051
fix typo
2019-06-07 22:56:32 -04:00
Nikolay Martynov
dd4b4c38f3
Refactor smoketests setup
...
Move start/stop of servers in smoke tests from gradle code to test
code.
This gives more flexibility in terms of what we can do there.
This also allows us to run servers under test with same JVM as the
test itself - not same jvm as gradle which is currently locked to Java8
2019-06-07 22:56:28 -04:00
Tyler Benson
ec60d679d6
Add Oracle support and fix muzzle.
2019-06-06 18:03:56 -07:00
Nikolay Martynov
822efd5df5
Skip couchbase 2.7.5 version in muzzle
...
This should make muzzle test pass. 2.7.5 was broken during its release.
2019-06-06 17:50:58 -04:00
Nikolay Martynov
0851dc4826
Undo Couchbase gradle hack
...
Looks like 2.7.5 has now fully propagated through the mirrors so we
can revert hack that made things compile.
2019-06-06 17:44:59 -04:00
Luca Abbati
1dc8467c26
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/non-static-config
2019-06-06 18:11:43 +02:00
Nikolay Martynov
69a780a940
Merge pull request #867 from DataDog/mar-kolya/undo-akka-latest-dep-hack
...
Undo akka latest dep hack
2019-06-06 11:04:15 -04:00
Nikolay Martynov
eddf5d98d8
Undo akka latest dep hack
2019-06-06 10:05:18 -04:00
Nikolay Martynov
7863a68a53
Fix typo
2019-06-06 09:41:36 -04:00
Tyler Benson
6100443443
Attempt to properly parse out instance name from JDBC url
...
Unfortunately implementations are INCREDIBLY inconsistent on the matter. Oracle implementation is still pending since it’s really complicated.
2019-06-05 18:01:33 -07:00
Luca Abbati
b6572bfd55
Reset test tracer in TraceAnnotationsTest to pick new configs
2019-06-05 18:52:25 +02:00
Luca Abbati
057ca7b66e
Refresh the tracer with changed config properties now that we are using instances
2019-06-05 15:38:00 +02:00
Luca Abbati
ae03abe63c
Adapt tests to the new Config approach instance vs static
2019-06-05 12:17:09 +02:00
Luca Abbati
8debe771d4
Fix tests after changing config from static to instance access
2019-06-05 10:56:20 +02:00
Luca Abbati
901efee50e
Remove static usage of low level config methods from outside the config class
2019-06-04 15:13:40 +02:00
Tyler Benson
8016e22bc4
Review changes
2019-05-31 09:07:22 -07:00
Tyler Benson
9cdf049ca7
Extract ConfigUtils
2019-05-30 09:09:29 -07:00
Tyler Benson
a7c941c2ea
More fixes.
...
Notably added a transformer to make config easier to test with by making INSTANCE public static volatile.
2019-05-29 22:24:19 -07:00
Tyler Benson
fc9f1d120c
Misc fixes.
2019-05-29 13:54:35 -07:00
Tyler Benson
71101ac8d0
Add http.query.string tag when enabled
...
Disabled by default.
Enable for http servers with:
* System Property: `dd.http.server.tag.query-string=true`
* Environment Variable: `DD_HTTP_SERVER_TAG_QUERY_STRING=true`
Enable for http clients with:
* System Property: `dd.http.client.tag.query-string=true`
* Environment Variable: `DD_HTTP_CLIENT_TAG_QUERY_STRING=true`
2019-05-29 13:54:35 -07:00
Tyler Benson
e260b1d044
Make all http client tests extend HttpClientTest
...
Add flexibility to handle inconsistencies between client integrations.
2019-05-29 13:54:35 -07:00
Tyler Benson
8c860d63a4
Revert Pull Request #854 and #855
...
These are breaking changes that need more vetting.
2019-05-29 12:18:31 -07:00
Luca Abbati
eb032d1c8e
Adding muzzle tests for glassfish 3 and 5
2019-05-29 17:53:42 +02:00
Luca Abbati
19c0b21332
Remove useless tests from Glassfish 4 instrumentation
2019-05-29 17:24:51 +02:00
Luca Abbati
37b734dd50
Some more attempts to UT glassfish classloader
2019-05-28 19:39:11 +02:00
Luca Abbati
f62e1dedeb
Add unit tests for glassfish 4.1 instrumentation
2019-05-28 15:06:43 +02:00
Luca Abbati
470a20dbce
Fix code formatting
2019-05-28 13:56:37 +02:00
Luca Abbati
5292b598d8
Remove log from GlassfishAdvice as log is not available
2019-05-27 16:20:46 +02:00
Luca Abbati
9d2523a58a
Reformat code
2019-05-27 15:50:47 +02:00