Commit Graph

3425 Commits

Author SHA1 Message Date
Nikolay Martynov b4ceedf1db
Merge pull request #984 from DataDog/mar0kolya/gradle-upgrade
Update gradle to 5.6.2
2019-09-10 12:21:03 -04:00
Nikolay Martynov 3b34970d52 Rename SERVICE -> SERVICE_TAG constant
To make meaning more clear
2019-09-10 11:41:44 -04:00
Laplie Anderson 3a7dcf3dcd Build java9-modules project with a jdk >= 9 2019-09-10 10:45:34 -04:00
Nikolay Martynov d9656bd96e Update gradle to 5.6.2 2019-09-10 10:34:33 -04:00
Tyler Benson 0681739ceb
Merge pull request #980 from marcoferrer/grpc-interceptor-error-tag
Fix span error tagging in grpc server interceptor
2019-09-09 15:58:47 -07:00
Marco Ferrer bcfb2ac3e7 run formatter 2019-09-06 19:58:57 -04:00
Marco Ferrer 8ee5d8ddc0 assert status code tag in streaming tests 2019-09-06 19:17:36 -04:00
Marco Ferrer f587011238 add TracingServerCall to helper class names 2019-09-06 18:48:44 -04:00
Marco Ferrer 57e03cc9ea update tests for new tags 2019-09-06 18:42:40 -04:00
Marco Ferrer 61d85d997a add comments for tracing call forwarder 2019-09-06 18:42:11 -04:00
Marco Ferrer b0074495f9 update tests for server error tag 2019-09-06 16:35:19 -04:00
Tyler Benson c1167af3cb
Merge pull request #979 from DataDog/tyler/trace-annotation-operation
Apply fixed default operation name for @Trace generated spans
2019-09-06 13:31:42 -07:00
Marco Ferrer b547886a0d introduce tracing call forwarder 2019-09-06 14:58:58 -04:00
Marco Ferrer 6ac07abe2b fix span error tagging in grpc server interceptor 2019-09-06 12:25:31 -04:00
Tyler Benson cd6dcf393b Apply fixed default operation name for @Trace generated spans
This should help reduce issues with multiple top level spans.
2019-09-05 16:21:27 -07:00
Tyler Benson df017e044a
Merge pull request #975 from DataDog/tyler/split-by-tag
Add new setting to allow renaming service by tag
2019-09-05 14:24:20 -07:00
Douglas Q Hawkins 2e5766ece9
Merge pull request #974 from DataDog/dougqh/no-lang-client-spans
Ensure "client" spans do not set the language tag
2019-09-05 13:38:25 -04:00
dougqh 46a36569e6 Adding FIXME for possible test clean-up 2019-09-05 13:23:51 -04:00
Tyler Benson 0c23cf94a9
Merge pull request #976 from DataDog/tyler/more-aws-tags
Add additional tags for aws-sdk spans
2019-09-04 13:35:41 -07:00
Tyler Benson c410f5b78b Add additional tags for aws-sdk spans
s3 -> bucket name
dynamodb -> table name
sqs -> queue name/url
kinesis -> stream name
2019-09-04 12:41:45 -07:00
Tyler Benson b20a32b44d
Merge pull request #895 from aantono/haystack
Added support for Haystack trace propagation
2019-09-04 11:09:08 -07:00
Laplie Anderson be60d362ae Manually call jlink because plugin won't work with our build 2019-09-04 13:11:03 -04:00
Laplie Anderson a3d792b4b9 ImageDir as a property is unneeded and can be derived 2019-09-04 13:11:03 -04:00
Laplie Anderson 9087c2e7e7 Pass the image dir directly instead of getting it from jlink 2019-09-04 13:11:03 -04:00
Laplie Anderson 8ba79db208 Disable task if version is too low. Include all sourcesets in jars 2019-09-04 13:11:03 -04:00
Laplie Anderson 6c5af673cd Minor issues 2019-09-04 13:11:03 -04:00
Laplie Anderson 3323bbc5b1 java.sql classes are not always present 2019-09-04 13:11:03 -04:00
Laplie Anderson fa378e16d3 Simply since the agent code doesn't run without java.instrument 2019-09-04 13:11:03 -04:00
Laplie Anderson 7a0ba452b8 Module smoke test framework 2019-09-04 13:11:03 -04:00
Laplie Anderson 983b4e2e6c
Merge pull request #973 from DataDog/landerson/all-tests-on-all-jvms
Run all tests on all java versions
2019-09-04 12:28:26 -04:00
Tyler Benson 8177b95164 Make config modifiable and still allow tag to be set. 2019-09-03 18:51:39 -07:00
Tyler Benson 82f5076716 Add new setting to allow renaming service by tag
This is a more generic form of the previous `split-by-domain` and `split-by-instance`.

(Note: evaluation is done when a tag is set, so If multiple tags are configured, the last tag set will take precidence.)

For example, this setting can be used to rename `aws-sdk` spans to be identified with the corresponding `aws.service` tag:

```
-Ddd.trace.split-by-tags=aws.service
```

There are some slight differences with this setting compared with`dd.trace.http.client.split-by-domain` and `dd.trace.db.client.split-by-instance`.  `split-by-tags` applies to every span, where `split-by-domain` and `split-by-instance` only apply to http and db client spans respectively.
2019-09-03 16:55:47 -07:00
Laplie Anderson 619ecb8170 Fix a couple tests failing with IBM 8 2019-09-03 17:19:46 -04:00
dougqh 1d087574fd Removing unused imports
Removing unused imports caught by codeNarc
2019-09-03 16:49:20 -04:00
dougqh 4851cc9069 Re-running format through gradle
Need to figure out why IntelliJ and gradle are behaving differently for import order
2019-09-03 16:16:13 -04:00
dougqh 57beee76d2 Running Google Code Formatter
Changes here are all non-functional -- and in methods unrelated to the core change
2019-09-03 14:09:46 -04:00
dougqh 3e2ef885a5 Ensure "client" spans do not set the language tag
The core changes are in Config and ServerDecorator.

Moved default tagging from Config::getRuntimeTags to Config::getLocalRootSpanTags.  This changes the result of Config::getMergedJmxTags as well.

To preserve language for servers changed ServerDecorator::afterStart.

Other changes are in tests - the most complicated part is in TagsAssert::defaultTags.  This now contains a bit too much conditional logic for my liking.
2019-09-03 13:20:50 -04:00
Laplie Anderson 457410ea4e Run all tests on all java version 2019-09-03 13:03:16 -04:00
Nikolay Martynov 02adf464e4
Merge pull request #972 from DataDog/mar-kolya/update-gradle
Update gradle to 5.6.1
2019-09-03 12:16:24 -04:00
Nikolay Martynov acb90867a4 More dependency updates 2019-09-03 10:38:39 -04:00
Nikolay Martynov df232f2d35 Update groovy lib 2019-09-03 10:26:59 -04:00
Nikolay Martynov 1ef3889a2f Update gradle to 5.6.1 2019-09-03 10:17:59 -04:00
Alex Antonov bf15ea1f5a Added tests for Haystack propagation support 2019-09-03 14:29:15 +02:00
Alex Antonov 93ae2678ff Added support for Haystack trace propagation 2019-09-03 11:04:01 +02:00
Laplie Anderson 79c519e4fe Begin 0.33.0 2019-08-30 18:57:25 -04:00
Laplie Anderson e158f110b6 Version 0.32.0 2019-08-30 16:42:54 -04:00
Laplie Anderson d94f5df00e
Merge pull request #968 from DataDog/landerson/better-internal-jar
Change packaging of internal jars
2019-08-30 15:09:41 -04:00
Tyler Benson a693c42dc1
Merge pull request #969 from DataDog/labbati/jax-rs-op-name
Static operation names for JaxRS instrumentation to be used as root span
2019-08-30 14:09:46 -04:00
Laplie Anderson ac2087eb4a Use .isolated instead of .jar 2019-08-30 14:06:51 -04:00
Laplie Anderson d03d583e85
Merge pull request #966 from DataDog/landerson/wrap-instrumentation-install
Wrap instrumentation installation with a try/catch
2019-08-30 14:02:13 -04:00