Commit Graph

2842 Commits

Author SHA1 Message Date
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
Nikolay Martynov eaf0a33887
Merge pull request #897 from DataDog/mar-kolya/smoke-test-file-naming
Improve smoke test app log file naming
2019-06-21 16:30:21 -04:00
Laplie Anderson 9e345ef8cc
Merge pull request #898 from DataDog/landerson/http-decorator-constants
Add "http.query.string" and "http.fragment.string" to DDTags
2019-06-21 16:23:59 -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
Nikolay Martynov 34ac31cf15 Improve smoke test app log file naming 2019-06-21 12:08:31 -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 d3266e9215
Merge pull request #889 from DataDog/mar-kolya/log-time-stamp
Configure system logger to log timestamp
2019-06-18 12:35:33 -04:00
Nikolay Martynov 736cb9c317
Merge pull request #888 from DataDog/mar-kolya/make-test-setup-more-flexible
Make test setup more flexible
2019-06-17 18:01:24 -04:00
Luca Abbati 896d485f94 Begin 0.31.0 2019-06-17 23:27:30 +02:00
Luca Abbati b43f6e97ac Version 0.30.0 2019-06-17 20:58:26 +02: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
Luca Abbati 72cad287ff
Merge pull request #862 from DataDog/labbati/config-file
Provide a way to configure the tracer using properties file
2019-06-17 17:28:07 +02:00
Nikolay Martynov 808e965c9b Add Zulu to circleci build 2019-06-17 11:26:47 -04:00
Nikolay Martynov 7fc5132ea6 Add support for forcing JDK to run tests on 2019-06-17 11:25:13 -04:00
Luca Abbati d865a1a249
Format code 2019-06-17 08:22:44 -04:00
Luca Abbati a3be0cbf9f
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/config-file 2019-06-17 08:11:50 -04:00
Luca Abbati d0b32147a8
Be more friendly for config file to unix users using tilde for home 2019-06-17 08:10:50 -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
Nikolay Martynov 350ff9bb1d
Merge pull request #884 from DataDog/mar-kolya/do-not-collect-cores
Revert "Collect more debugging info"
2019-06-14 11:37:10 -04:00
Nikolay Martynov f37e4a2ec2 Revert "Collect more debugging info"
This reverts commit a0fc54936a.
2019-06-14 11:18:17 -04: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
Luca Abbati f578c9ccf2
Remove system properties and envs left-over in Config tests 2019-06-14 11:50:11 +02:00
Tyler Benson a4d53b0dcd Update Cassandra Tests and more instance name cleanup 2019-06-13 15:55:40 -07:00
Tyler Benson 68567cdc9d
Merge pull request #880 from DataDog/tyler/mongo-instance
Update Mongo instance name and remove memcache instance name
2019-06-13 15:53:59 -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 51d552aec8
Merge pull request #871 from DataDog/tyler/update-mongo-tests
Replace Mongo tests with updated tests.
2019-06-13 14:33:36 -07:00
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