Commit Graph

3046 Commits

Author SHA1 Message Date
Nikolay Martynov 5e81ca7913
Merge pull request #879 from DataDog/mar-kolya/preserver-dot-gradle-in-workspace
Preserve .gradle in workspace
2019-06-13 15:39:42 -04:00
Nikolay Martynov 709a548925
Merge pull request #877 from DataDog/mar-kolya/collect-jvm-cores
Collect more debugging info
2019-06-13 15:38:28 -04: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 66126bbb70
Merge pull request #873 from DataDog/tyler/separate-latest-tests
Run latestDepTests in a separate job
2019-06-13 12:00:14 -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
Tyler Benson ca57aade8c Run latestDepTests in a separate job 2019-06-13 10:44:19 -07:00
Nikolay Martynov 16709c0954 Preserve .gradle in workspace 2019-06-13 13:25:09 -04: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 a0fc54936a Collect more debugging info 2019-06-13 11:59:37 -04: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
Nikolay Martynov fc30badbee
Merge pull request #875 from DataDog/mar-kolya/fix-artifacts-collection
Enable '**' support in logs collection scripts
2019-06-13 11:18:58 -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
Tyler Benson 0562b2abb5
Merge pull request #874 from DataDog/tyler/jackson-update
Update Jackson Databind to 2.9.9
2019-06-13 08:14:27 -07:00
Nikolay Martynov a2a9bec8a8 Enable '**' support in logs collection scripts
It is disabled by default now
2019-06-13 10:56:21 -04:00
Luca Abbati 12dc7c4fd8
Remove unused imports 2019-06-13 14:35:32 +02:00
Luca Abbati da05772897
Add properties file to a comment listing all the source of configuration 2019-06-13 14:35:32 +02:00
Luca Abbati bfd9680d75
Fix typos 2019-06-13 14:35:32 +02:00
Luca Abbati 076c2b1b4e
Removing synchronized as the load properties method no longer set the static istance 2019-06-13 14:35:32 +02:00
Luca Abbati 4dd6708852
Update comment on Config class to show new functionality 2019-06-13 14:35:31 +02:00
Luca Abbati 1d57a5873b
Tests for functionality: Config fallback to properties files 2019-06-13 14:35:31 +02:00
Luca Abbati 6fc69ba64e
Config to fallback to properties file to load settings 2019-06-13 14:35:31 +02: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
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
Tyler Benson 742fc2ff8b Update Jackson Databind to 2.9.9
Due to new security vulerablility.
2019-06-11 19:03:26 -07: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
Tyler Benson 3c68c09101 Review fixes. 2019-06-11 11:12:50 -07: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
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 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