Commit Graph

2633 Commits

Author SHA1 Message Date
Luca Abbati b09aa1a59d Enable JMXFetch by default 2019-05-23 11:09:07 -07:00
Tyler Benson 5f8e186dcb Fix task inputs/outputs. 2019-05-22 16:00:20 -07:00
Tyler Benson b505c60543 Use jmx AppConfig Builder instead of factory method
Expose new options for configuring JMXFetch with standard datadog-agent config files with `jvm_direct: true` set as an instance attribute (this will be ignored by the datadog-agent).

For Example:
* `dd.agent.conf.d=/opt/datadog-agent/etc/conf.d`
* `dd.jmxfetch.configs=activemq.d/conf.yaml,jmx.d/conf.yaml`
will load jmx configs in those two files that have `jvm_direct: true` in their `instance` setup.

Environment variables can also be used: `DD_AGENT_CONF_D` and `DD_JMXFETCH_CONFIGS`

Depends on https://github.com/DataDog/jmxfetch/releases/tag/0.29.0 being released.
2019-05-21 17:13:56 -07:00
Tyler Benson 204b7cdd4c Update Integrations Core to 6.11.2 2019-05-21 08:33:09 -07:00
Tyler Benson 200a9063fa Begin 0.29.0 2019-05-17 14:17:25 -07:00
Tyler Benson 3c5095ffbd Version 0.28.0 2019-05-17 13:51:53 -07:00
Luca Abbati 7989098acc
Merge pull request #846 from DataDog/labbati/better-hostname
Avoid setting hostname tag on local root span if empty
2019-05-17 22:44:37 +02:00
Luca Abbati 06f13fd570
Simplify how we calculate local root span tags 2019-05-17 22:32:03 +02:00
Luca Abbati 7a9d54d2c1
Avoid setting hostname tag on local root span if empty (followup) 2019-05-17 22:01:14 +02:00
Luca Abbati 0da9991805
Avoid setting hostname tag on local root span if empty (followup) 2019-05-17 22:00:44 +02:00
Luca Abbati 3b8257a123
Avoid setting hostname tag on local root span if empty 2019-05-17 21:55:02 +02:00
Nikolay Martynov 429fb6772e
Merge pull request #845 from DataDog/mar-kolya/fix-test-race-condition
Fix ApacheHttpAsync race condition
2019-05-17 14:25:36 -04:00
Nikolay Martynov c5dbd7d0d7 Fix ApacheHttpAsync race condition 2019-05-17 13:49:46 -04:00
Luca Abbati 920b9b5ad3
Merge pull request #827 from DataDog/labbati/hostname
Detect hostname
2019-05-17 19:30:02 +02:00
Luca Abbati 88b6a2ce51
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/hostname 2019-05-17 19:16:50 +02:00
Nikolay Martynov 47e6216e6b
Merge pull request #842 from DataDog/mar-kolya/limit-couchbase-latest-dep-version
Do not try to build against couchbase 2.7.5 since it didn't sync up w…
2019-05-17 13:14:34 -04:00
Nikolay Martynov 48f951cee7
Merge pull request #841 from DataDog/mar-kolya/ignore-flaky-test
Wait for span to finish in apache-http-aync test
2019-05-17 13:13:38 -04:00
Tyler Benson d900289ae0 Try again… 2019-05-17 10:01:37 -07:00
Nikolay Martynov e52c654fd1 Wait for span to finish instead of ignoring test 2019-05-17 12:55:34 -04:00
Tyler Benson b6ba1997ae Add constraint for muzzle too 2019-05-17 09:32:15 -07:00
Nikolay Martynov 6287e552fc
Merge pull request #836 from DataDog/mar-kolya/do-not-send-headers-to-old-kafka
Do not send headers to old kafka servers
2019-05-17 11:55:52 -04:00
Luca Abbati 6399fee839
Remove caching of hostname detection in config class 2019-05-17 17:46:16 +02:00
Nikolay Martynov d01832a94d Do not try to build against couchbase 2.7.5 since it didn't sync up with mirrors yet 2019-05-17 11:27:35 -04:00
Nikolay Martynov c02110a2a1 Add comment explaining Kafka versions limitations check 2019-05-17 11:22:02 -04:00
Nikolay Martynov 387f094617 Ignore flaky apache-http-aync test 2019-05-17 11:19:24 -04:00
Luca Abbati 5959c9cadd
Merge pull request #840 from DataDog/revert-823-labbati/jmx-on-default
Revert "Enable JMXFetch by default"
2019-05-17 17:07:36 +02:00
Luca Abbati 04392bf28e
Revert "Enable JMXFetch by default" 2019-05-17 17:02:58 +02:00
Luca Abbati db82c69ebe
Merge pull request #823 from DataDog/labbati/jmx-on-default
Enable JMXFetch by default
2019-05-17 14:28:44 +02:00
Luca Abbati 8b2b83bc13
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/hostname 2019-05-17 10:16:43 +02:00
Luca Abbati ad3401b815
Apply suggestions from CR #827 2019-05-17 10:15:03 +02:00
Nikolay Martynov 94907270a2
Merge pull request #837 from DataDog/mar-kolya/fix-apache-async-instrumentation-with-null-callback
Handle null callback in HttpAsyncApache instrumentation
2019-05-16 17:41:39 -04:00
Nikolay Martynov b736ca3108 Handle null callback in HttpAsyncApache instrumentation 2019-05-16 17:26:08 -04:00
Nikolay Martynov 55d7c2a6f5 Do not send headers to old kafka servers
Kafka message bundles with versions below 2 (e.d. 0.10) do not support
headers so do not inject them. Otherwise client gets really upset.

This is how similar check is being done in Kafka client itself:
05fcfde8f6/clients/src/main/java/org/apache/kafka/common/record/MemoryRecordsBuilder.java (L411-L412)
2019-05-16 15:09:58 -04:00
Luca Abbati 1d5dd5b28a
Refactor merging application root span tags with jmx base tags 2019-05-16 19:54:25 +02:00
Nikolay Martynov 03763e7e47
Merge pull request #835 from DataDog/mar-kolya/do-not-run-smoke-test-servers-on-check
Do not run smoke test servers when tests are disabled
2019-05-16 13:24:10 -04:00
Tyler Benson 354d17ac7d
Merge pull request #830 from DataDog/tyler/executor-config
Add config to enable individual executors
2019-05-16 10:05:29 -07:00
Nikolay Martynov 6b6668826d Do not run smoke test servers when tests are disabled
Unfortunately Gradle seem to need some manual help to figure this one out.
2019-05-16 12:44:20 -04:00
Tyler Benson 4a8bea4602
Merge pull request #833 from DataDog/tyler/ratpack-resource-naming
Fix resource name for Ratpack
2019-05-16 08:58:26 -07:00
Luca Abbati 85684f955b
Remove unused imports from test 2019-05-16 14:51:27 +02:00
Luca Abbati 2a975b31ee
Adapt test to new DDTracer constructor and unserializable field 2019-05-16 14:35:56 +02:00
Luca Abbati 10069847a3
Define the concept of applicationRootSpanTags and apply only to root
tags
2019-05-16 12:25:43 +02:00
Luca Abbati 0e9f9d9d02
Refactor names of DDSPan's methods to interact with root span
The naming of methods in DDSpan used to detect/retrieve the root span
for a fiven span were slightly misleading. Specifically 'isRootSpan()'
returned true if and only if the span is the root span of teh entire
trace(even in the context of distributed tracing), while getRootSpan()
return the root span of the trace fragment generated by the currently
traced application. I hope that trenaming such methods to
'isTraceRootSpan()' and 'getApplicationRootSpan()' respectively will
help adding some clarity.
The old method names have not been removed for backward comptibility
reasons and tests have been added, but they have been marked as
deprecated.
2019-05-16 11:31:37 +02:00
Tyler Benson 3bbf9f27eb Fix resource name for Ratpack
Previous fallback would inadvertently include query parameters in the resource name.
2019-05-15 16:30:51 -07:00
Luca Abbati 23ffcf0fce
Apply workaround to refresh configuration values during tests 2019-05-15 16:00:14 +02:00
Luca Abbati 8231ea1cb2
Merge branch 'master' of github.com:DataDog/dd-trace-java into labbati/hostname 2019-05-15 13:48:26 +02:00
Luca Abbati c8a04b0a4f
Refactor hostname detection in tracer 2019-05-15 13:42:43 +02:00
Tyler Benson cc23fee614 Add config to enable individual executors
Or all executors, bypassing the allow list.

`dd.trace.executor=com.MyCustomExecutor,com.OtherExecutor`
`dd.trace.executors.all=true`

Turns out in many cases, executors that we say we’re skipping, are still being traced because they extend from an already instrumented executor.
2019-05-14 10:03:44 -07:00
Nikolay Martynov ad2663d840
Merge pull request #829 from DataDog/mar-kolya/update-checkstyle
Update checkstyle to latest public version
2019-05-13 15:14:41 -04:00
Nikolay Martynov f3d808d540 Update checkstyle to latest public version 2019-05-13 13:14:28 -04:00
Luca Abbati 7fd16d1eef
Add tests for hostname detection 2019-05-13 18:31:15 +02:00