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
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
a2a9bec8a8
Enable '**' support in logs collection scripts
...
It is disabled by default now
2019-06-13 10:56:21 -04:00
12dc7c4fd8
Remove unused imports
2019-06-13 14:35:32 +02:00
da05772897
Add properties file to a comment listing all the source of configuration
2019-06-13 14:35:32 +02:00
bfd9680d75
Fix typos
2019-06-13 14:35:32 +02:00
076c2b1b4e
Removing synchronized as the load properties method no longer set the static istance
2019-06-13 14:35:32 +02:00
4dd6708852
Update comment on Config class to show new functionality
2019-06-13 14:35:31 +02:00
1d57a5873b
Tests for functionality: Config fallback to properties files
2019-06-13 14:35:31 +02:00
6fc69ba64e
Config to fallback to properties file to load settings
2019-06-13 14:35:31 +02:00
bd1e9a01db
Fixed missing blank line
2019-06-13 14:34:27 +02:00
a8dd35ef57
Improve AgentRunner and ConfigUtils class based on CR comments
2019-06-13 12:40:10 +02:00
a522196b49
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/non-static-config
2019-06-12 23:57:20 +02:00
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
3ea07d9468
Require Java8 for play smoke tests
2019-06-12 11:51:58 -04:00
2dbc3550ab
Code formatting fixes
2019-06-12 11:28:04 -04:00
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
d0fbbf85ce
Format code
2019-06-12 14:35:48 +02:00
e1ceda8f0e
Improve config usage as instance based on CR
2019-06-12 14:00:36 +02:00
742fc2ff8b
Update Jackson Databind to 2.9.9
...
Due to new security vulerablility.
2019-06-11 19:03:26 -07:00
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
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
3c68c09101
Review fixes.
2019-06-11 11:12:50 -07:00
6f97243a12
Merge pull request #869 from DataDog/mar-kolya/refactor-smoke-tests
...
Refactor smoketests setup
2019-06-11 10:37:14 -04:00
1a5a70650c
Fix SpringJpaTest
2019-06-10 17:18:58 -07:00
4469c7fb11
separate out driver subtype
...
to avoid changing existing service names
2019-06-10 16:17:36 -07:00
288add2a60
Fix slickdb test
2019-06-10 15:20:56 -07:00
0807598d16
Populate settings from properties and add MariaDB alt styles
2019-06-10 12:02:14 -07:00
e9c9dd434b
Fix typo
2019-06-10 13:31:50 -04:00
8fa14ad33e
Remove DDJavaAgentInfo - it doesn't seem to be used
2019-06-07 22:56:32 -04:00
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
f172d59051
fix typo
2019-06-07 22:56:32 -04:00
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
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
fc6d3a1f42
Merge pull request #868 from DataDog/mar-kolya/add-java12
...
Add java12 to the build
2019-06-07 08:59:40 -04:00
ec60d679d6
Add Oracle support and fix muzzle.
2019-06-06 18:03:56 -07:00
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
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
c1ce3c7103
Add Java12 build
2019-06-06 16:58:18 -04:00
597055fca3
Fix typo
2019-06-06 16:55:39 -04:00
1dc8467c26
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/non-static-config
2019-06-06 18:11:43 +02:00
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
2adbd9b256
Merge pull request #865 from DataDog/mar-kolya/update-jacoco
...
Update jacoco
2019-06-06 11:04:02 -04:00
eddf5d98d8
Undo akka latest dep hack
2019-06-06 10:05:18 -04:00
7863a68a53
Fix typo
2019-06-06 09:41:36 -04:00
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
b6572bfd55
Reset test tracer in TraceAnnotationsTest to pick new configs
2019-06-05 18:52:25 +02:00
15504c004a
Simplify jacoco code a bit
2019-06-05 12:43:50 -04:00
155f0c3af8
Use newer jacoco
2019-06-05 12:38:07 -04:00
057ca7b66e
Refresh the tracer with changed config properties now that we are using instances
2019-06-05 15:38:00 +02:00
Tyler Benson
Nikolay Martynov
Luca Abbati