Commit Graph

2712 Commits

Author SHA1 Message Date
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
Nikolay Martynov 6c5991fadf
Merge pull request #872 from DataDog/mar-kolya/fix-java-home-in-integration-tests
Be more specific about java binary and home location in integration t…
2019-06-12 12:26:49 -04:00
Nikolay Martynov 3ea07d9468 Require Java8 for play smoke tests 2019-06-12 11:51:58 -04:00
Nikolay Martynov 2dbc3550ab Code formatting fixes 2019-06-12 11:28:04 -04:00
Nikolay Martynov 07dda4dd9d Be more specific about java binary and home location in integration tests
Otherwise things work in weird way on Linux
2019-06-12 11:17:23 -04:00
Luca Abbati d0fbbf85ce
Format code 2019-06-12 14:35:48 +02:00
Luca Abbati e1ceda8f0e
Improve config usage as instance based on CR 2019-06-12 14:00:36 +02:00
Nikolay Martynov 2c173549b7
Merge pull request #870 from DataDog/mar-kolya/cleanup-tooling-dependencies
Make agent-tooling compile-depend on dd-tracing-ot directly
2019-06-11 15:32:45 -04: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
Nikolay Martynov 6f97243a12
Merge pull request #869 from DataDog/mar-kolya/refactor-smoke-tests
Refactor smoketests setup
2019-06-11 10:37:14 -04:00
Nikolay Martynov e9c9dd434b Fix typo 2019-06-10 13:31:50 -04: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
Nikolay Martynov 1ae79c65e8
Merge pull request #849 from DataDog/mar-kolya/undo-couchbase-gradle-hack
Undo Couchbase gradle hack
2019-06-07 09:08:03 -04:00
Nikolay Martynov fc6d3a1f42
Merge pull request #868 from DataDog/mar-kolya/add-java12
Add java12 to the build
2019-06-07 08:59:40 -04: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
Nikolay Martynov c1ce3c7103 Add Java12 build 2019-06-06 16:58:18 -04:00
Nikolay Martynov 597055fca3 Fix typo 2019-06-06 16:55:39 -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 2adbd9b256
Merge pull request #865 from DataDog/mar-kolya/update-jacoco
Update jacoco
2019-06-06 11:04:02 -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
Luca Abbati b6572bfd55
Reset test tracer in TraceAnnotationsTest to pick new configs 2019-06-05 18:52:25 +02:00
Nikolay Martynov 15504c004a Simplify jacoco code a bit 2019-06-05 12:43:50 -04:00
Nikolay Martynov 155f0c3af8 Use newer jacoco 2019-06-05 12:38:07 -04: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 a889c46715
Merge pull request #860 from DataDog/tyler/http.query.string
Add http.query.string tag when enabled
2019-05-31 09:47:19 -07: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 d449d60ab8 Begin 0.30.0 2019-05-29 13:18:23 -07:00
Tyler Benson ed72307cb1 Version 0.29.1 2019-05-29 12:57:47 -07:00
Tyler Benson 1dcb4df8bf
Merge pull request #861 from DataDog/tyler/revert-changes
Revert Pull Request #854 and #855
2019-05-29 12:42:34 -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
Tyler Benson b461584a3f Begin 0.30.0 2019-05-29 10:15:27 -07:00
Tyler Benson b5ea12409f Version 0.29.0 2019-05-29 10:01:53 -07:00
Luca Abbati 7ec8339f4f
Merge pull request #839 from DataDog/labbati/jdbc-error-glasshfish
Glassfish: prevent blacklisting of specific classes and dump stacktrace in debug mode if this happens
2019-05-29 18:57:05 +02: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