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
Luca Abbati
13cf53827d
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/jdbc-error-glasshfish
2019-05-27 15:18:18 +02:00
Luca Abbati
0c52ba58c4
Move glassfish 4 compatibility layer to instrumentation module
2019-05-27 15:17:04 +02:00
Tyler Benson
0ea2d74744
Merge pull request #857 from DataDog/tyler/misc
...
Fix log message and add ignores
2019-05-24 14:23:01 -07:00
Nikolay Martynov
70fa97f8c2
Move code to make java7 happy
2019-05-24 16:55:39 -04:00
Nikolay Martynov
ef94e2fb79
Add note about Kafka consumer iterator thread safety
2019-05-24 16:37:27 -04:00