Commit Graph

508 Commits

Author SHA1 Message Date
Trask Stalnaker 6d5ec329d6
Enable checkstyle for google style guide (#1641) 2020-11-16 18:46:59 -08:00
Anuraag Agrawal d435da4638
Update to Gradle 6.7 and use new toolchains feature for testing on Ja… (#1627)
* Update to Gradle 6.7 and use new toolchains feature for testing on Java versions.

* Update docs

* Add back sum

* Use GitHub test JDK for toolchain.

* Use maxJavaVersionForTests for default test version when set.

* Fix RMI

* Fix configs

* Go back to rule

* Extract variable for default Java version.
2020-11-16 10:29:36 +02:00
Ago Allikmaa 995e2caee0
Update ByteBuddy to 1.10.18, adjust to new ByteBuddy gradle plugin (#1596)
* Adjust for use with ByteBuddy 1.10.18

* Fix language choices for ByteBuddy transformation.

* Remove no longer used MuzzleCodeGenerationPlugin$NoOp
2020-11-12 12:34:06 +02:00
Nikita Salnikov-Tarnovski 7f012c585d
Update publish.gradle (#1611)
Do not automatically publish to Bintray after upload
2020-11-10 15:04:24 +02:00
Anuraag Agrawal 3d21c26632
Update to SDK 0.10.0 (#1564) 2020-11-05 13:17:47 -08:00
Anuraag Agrawal d9e978c8d8
Update to latest snapshot (#1560) 2020-11-05 20:49:32 +09:00
Anuraag Agrawal e1c7baab42
Upgrade to latest SDK snapshot (#1549) 2020-11-05 17:45:59 +09:00
Jakub Wach 049358e81b
apache camel 2.20.x instrumentation (#1397)
* apache camel 2.20.x instrumentation

* removed instrumentation advice from helper classes

* code review #1

* code review #2 / experimental server name update

* code review changes / new tests, improved direct, new license header

* rebase changes

* code review changes

* code review changes, REST tests added

* changes after rebase to newest master

* code review changes

* code review

* code review

* rebase to master
2020-11-03 11:42:33 +02:00
Anuraag Agrawal a528daee52
Update to latest snapshot (#1544) 2020-11-03 17:08:17 +09:00
Anuraag Agrawal 5d2cb459df
Update to latest SDK snapshot (#1539) 2020-11-02 16:07:53 +09:00
Anuraag Agrawal 7132757792
Update to latest snapshot (#1532) 2020-11-01 16:19:12 +09:00
Anuraag Agrawal c6eee70660
Update to latest snapshot. (#1524) 2020-10-29 18:54:09 -07:00
Anuraag Agrawal fd03a4b1e1
Replace ContextStore for context bridge with a custom context storage… (#1493)
* Replace ContextStore for context bridge with a custom context storage provider.

* Handle context mapping at storage layer.

* Cleanup

* Add interop test

* Small comment

* No threads

* Groovy
2020-10-29 15:42:50 +09:00
Anuraag Agrawal a2dccf2316
Update to latest SDK snapshot. (#1479) 2020-10-26 19:29:46 -07:00
Anuraag Agrawal f6ad05b8e3
Update to latest SDK snapshot (#1384)
* Update to latest SDK snapshot

* Use published snapshot

* Fixes

* Cleans

* spotless

* Most

* Clean

* Merge

* Temporarily remove context interop

* WIP

* Prepare for intercepting propagated span

* Bump SDK

* IDE updates

* Lots

* compileJava

* Done?

* bar

* Spot

* drugs

* Groovy--

* green for me

* Spot

* Remove grpc import

* Scrub
2020-10-25 15:14:32 +09:00
Mateusz Rzeszutek 50990a7c17
Cassandra instrumentations should store normalised CQL queries as db.statement (#1427)
* Move `DbSystem` to package `...instrumentation.api.db`
* Move `SqlNormalizer` to `javaagent-api`  package ...api.db.normalizer
* Refactor Cassandra tests so that they use testcontainers (and run on Java 11)
* Implement Cassandra statement normalization
2020-10-22 17:56:06 +02:00
Ioannis Mavroukakis 9b91236775
ensure all published artifacts have a groupId (#1438)
* ensure all published artifacts have a groupId

* put exporters in to the javaagent group

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-10-22 13:33:16 +03:00
Nikita Salnikov-Tarnovski 7d77b2dc37
Prefer mavenCentral over jcenter (#1440)
* Prefer mavenCentral over jcenter

* Skip broken version for muzzle
2020-10-21 18:59:29 +03:00
Nikita Salnikov-Tarnovski 15e0b2ff32
Run build without warnings (#1387) 2020-10-15 16:10:22 -07:00
Mateusz Rzeszutek ee0e0a9697
Muzzle improvements: docs, javadocs, renamings and minor refactoring (#1379) 2020-10-14 16:49:51 -07:00
Trask Stalnaker 7ecc9bb37b
Rename "auto" to "javaagent" in modules (#1370) 2020-10-13 12:32:13 -07:00
Trask Stalnaker 1b51d4a6b1
Rename packages (#1367) 2020-10-11 13:54:35 -07:00
Pavol Loffay 3f5c644885
Add Prometheus metric exporter (#1262) 2020-10-09 12:06:51 -07:00
Ioannis Mavroukakis 020d445dd3
spotbugs upgrade and fixes for JMS1 tests (#1346)
* spotless upgrade and fixes for JMS1 tests

* includes missed bugs in KotlinCoroutineTests

* create spotBugs XML reports on CI, HTML locally

* use updatedCodeNarc rules with lowercase tolerance

* remove if and move bool to each property

* allow spotBugs gradle plugin to upgrade the spotbugs tool

* revert to original test

* exclude all kotlin source from spotbugs

* remove default location for spotBugs report

* do not pass null to a Span's attribute
2020-10-09 11:19:00 +03:00
Trask Stalnaker 4624584979
Update spotless config (#1349)
* Apply spotless to buildSrc

* Apply spotless

* Update spotless version

* Apply spotless

* Another spotless update

* Apply spotless
2020-10-09 07:21:28 +03:00
Anuraag Agrawal 9c030591f2
Update to SDK 0.9.1 (#1344) 2020-10-08 17:50:25 +09:00
Trask Stalnaker 71511d8dbf
Update codenarc config (#1335) 2020-10-07 21:49:07 +03:00
Ioannis Mavroukakis 9523f9ffe6
fix and/or ignore spotbugs errors (#1325) 2020-10-06 19:39:17 -07:00
Anuraag Agrawal 46b04087ee
Allow parenting with the AWS Lambda span itself. (#1323)
* Allow parenting with the AWS Lambda span itself.

* Merge

* Fix propagator only set in library
2020-10-07 09:42:34 +09:00
Nikita Salnikov-Tarnovski a4fab1396b
Fix compatibility problem with Docker for Mac 2.4 (#1332)
* Fix compatibility problem with Docker for Mac 2.4

* Polish
2020-10-06 13:54:31 +03:00
Anuraag Agrawal 5bba5d8482
Update to latest snapshot (#1331)
* Update to latest snapshot

* Update to latest snapshot

* instrumentation-api

* spotless
2020-10-06 17:47:41 +09:00
Nikita Salnikov-Tarnovski aa79224f32
Ported JMS 1.x tests to testcontainers (#1327)
* Ported JMS 1.x tests to testcontainers

* Polish

* Debug

* Fix test

* spotless

* Remove otel.trace.classes.exclude properties

* codenarc

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-10-06 09:05:51 +03:00
Anuraag Agrawal dadaac9a8c
Use 2-line license header to match SDK repo (#1321)
* Use 2-line license header to match SDK repo

* Apply change
2020-10-05 14:29:56 +09:00
Anuraag Agrawal f2194a928c
Update to latest snapshot. (#1304) 2020-10-04 19:41:10 -07:00
Nikita Salnikov-Tarnovski 86961d496a
Compile error workaround (#1305)
* Compile error workaround

* Better workaround
2020-10-02 13:36:16 +03:00
Mateusz Rzeszutek 9e591bb01a
Refactoring Config into @AutoValue POJO (#1254) 2020-09-28 22:08:45 -07:00
Trask Stalnaker 8954f222c0
Update to the latest opentelemetry-java 0.9.0-SNAPSHOT (#1266) 2020-09-26 20:44:28 -07:00
Pavol Loffay 91b177165c
Bump Java from 14 to 15 in CI (#1252)
* Bump Java from 14 to 15 in CI

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* Review comments

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* adjust comment

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* Bump jacoco to 0.8.6

Signed-off-by: Pavol Loffay <ploffay@redhat.com>

* maxJavaVersionForTests

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
2020-09-24 15:27:33 +03:00
Nikita Salnikov-Tarnovski e74ffe2e52
Remove support for java7 from buildscripts (#1229)
* Remove support for java7 from buildscripts

* Remove support for java7 from buildscripts
2020-09-23 15:40:21 +03:00
Anuraag Agrawal 4c54656f1e
Add configuration for error prone / nullaway to allow opting in packa… (#1203)
* Add configuration for error prone / nullaway to allow opting in package by package.

* Guava annotated too
2020-09-15 18:59:50 +09:00
Anuraag Agrawal 912a159c19
Update to latest SDK snapshot. (#1202) 2020-09-15 17:49:10 +09:00
Anuraag Agrawal 5289520203
Fix groups / base name for javaagent artifacts (#1173) 2020-09-09 09:38:29 +03:00
John Bley 030e9fe107
Properly track causality of kotlin suspend functions (#1168)
* Initial work on kotlin suspend functions.

Introduce new instrumentation to capture kotlin suspended coroutines
and track/update Context appropriately.  Add high-concurrency test
showing the issue and that it is solved.

* spotlessApply

* Fix spelling of continuation.

* Fix kotlin style

* Add kotlin dependencies to muzzle

* Fix muzzle in another package that pulls in java-concurrent.

* Use runBlocking instead of a sleep to finish test

* Clarify and improve comments on how/why

* Move kotlin coroutines instrumentation to top-level instrumentation module

* Properly build muzzle check for kotlin-coroutines

* Merge kotlin-testing into regular src/test rather than separate module

* Clean up attach/detach logic

* Tighten bounds and skipVersions on kotlin muzzle

* Rename fields and clean up attach logic

* Clean up types/side-effect code

* spotlessApply

* Enhance muzzle testing to properly test latest kotlin.
Required updating a few kotlin-y things to latest version to properly resolve the jvm
variant of their new multiplatform stuff.
2020-09-09 14:11:00 +09:00
Anuraag Agrawal 1217882a30
Move archivesBaseName into instrumentation gradle in a way that supports both old and new folder scheme. (#1169) 2020-09-04 12:38:58 +03:00
Anuraag Agrawal 5c86bcc20d
Update SDK dependency to released 0.8.0 (#1162)
* Update SDK dependency to released 0.8.0

* Update exporter

* Fix fake-backend proto reference
2020-09-03 17:09:51 +09:00
Anuraag Agrawal 7ec06e2d26
Add missing constraint on opentelemetry-proto (#1154) 2020-09-02 14:29:48 +09:00
Anuraag Agrawal 4c3e99fec8
Set instrumentation groups to unique values when using auto/library/testing pattern. (#1145) 2020-09-01 20:04:32 +09:00
Trask Stalnaker f738a50323
Fix build due to snapshot issue (#1127) 2020-08-29 21:24:50 -07:00
Anuraag Agrawal 770502eed9
Merge exporter auto config into javaagent-tooling. (#1120)
* Merge exporter auto config into javaagent-tooling.

* Update javadoc
2020-08-30 11:07:48 +09:00
Nikita Salnikov-Tarnovski e20cba57c2
Telemetry auto version (#1112)
* Provide telemetry.auto.version

* Report instrumentation library version

* Rename class

* Format
2020-08-27 23:16:17 +03:00
Nikita Salnikov-Tarnovski c0cd7ca23b
Removing some gralde warnings (#1094) 2020-08-26 19:58:55 -07:00
Nikita Salnikov-Tarnovski bc98955176
Update to latest otel-java snapshot (#1057)
* Update to latest otel-java snapshot

* Upgrade to working otel-java snapshot

* Update to latest otel-java snapshot

* Update to latest otel-java snapshot
2020-08-26 22:03:28 +03:00
Anuraag Agrawal 9cd2d627ca
Upgrade to Gradle 6.6 (#1073) 2020-08-20 16:30:47 +09:00
Trask Stalnaker 269b3575ef
Format gradle files (#1070) 2020-08-19 19:05:45 -07:00
Anuraag Agrawal bbfdbb39c0
Create abstraction for library dependencies for instrumentation. (#977)
* Create abstraction for library dependencies for instrumentation.

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-08-19 08:57:31 +09:00
Trask Stalnaker 6a07b173af
Rename auto exporters module (#1022) 2020-08-17 21:04:13 -07:00
Nikita Salnikov-Tarnovski f3c049f2ff
Some tweaks to improve gradle cacheability (#1030) 2020-08-17 22:57:49 +03:00
Trask Stalnaker f893ca540b
Scripted package renaming (#988) 2020-08-15 21:55:01 -07:00
Nikita Salnikov-Tarnovski 08b4303d93
Try CiMate (#980) 2020-08-14 23:23:52 +03:00
Trask Stalnaker f46ba88c29
Rename library-api artifact to instrumentation-api (#969) 2020-08-13 22:43:39 -07:00
Trask Stalnaker bf9c160570
Rename javaagent modules (#952) 2020-08-12 22:50:14 -07:00
Trask Stalnaker d778297b55
Only retry tests in CI (#950) 2020-08-13 07:53:19 +09:00
Anuraag Agrawal e9d456d616
Instrument DefaultSpan.create to return a bridged span. (#947) 2020-08-12 10:39:47 -07:00
Nikita Salnikov-Tarnovski a222676a3e
Improved smoke tests (#934)
* Preping smoke tests

* Improved smoke tests

* Make it work in Linux

* Add workflow to run tests on PR

* Build Smoke tests

* Fix PR workflow trigger

* Fix smoke test apps trigger

* Disable smoke tests in CircleCI and let them run in Github Actions only

* Fix smoke test apps docker image names

* Polish
2020-08-12 12:34:14 +03:00
Anuraag Agrawal 0eafc28608
Run tests using JUnit5 platform and remove SpockRunner (#770)
* Run tests with JUnit platform

* Matcher

* Restore

* Don't mix JUnit4 with JUunit5 in spring tests

* Separate out tests that need custom class loader.

* Separate out test for a couple classes that need it, try to remove SpockRunner, but Grizzly?

* Remove SpockRunner

* Fix grizzly

* Remove assumeTrue workaround.

* Comments
2020-08-12 11:05:26 +09:00
Trask Stalnaker 275fab6ea5
Retry all tests (#941) 2020-08-11 00:20:47 -07:00
Trask Stalnaker b5fbf90977
Extract instrumentation api module (#884) 2020-08-09 22:52:33 -07:00
Trask Stalnaker 2c786ab1a1
Fix WithSpan annotation instrumentation (#929) 2020-08-09 21:46:50 -07:00
Trask Stalnaker f9f6d1f6b3
Change library shading approach (#930) 2020-08-09 11:16:34 -07:00
Anuraag Agrawal 2ac65a67d5
Replace Spock retry with Gradle retry. (#908)
* Replace Spock retry with Gradle retry.

* Retry akka for real

* Warning
2020-08-06 17:59:40 +09:00
Munir Abdinur 906d80be12
clean up spring dependencies (#878) 2020-08-03 19:07:36 -07:00
Trask Stalnaker eed2359803
Update to SDK version 0.7.0 (#881) 2020-08-03 16:06:25 -07:00
Anuraag Agrawal ad3963303d
Merge integration tests back into test. (#871) 2020-08-02 15:41:47 +09:00
Anuraag Agrawal 87bf97da70
Generate bootstrap jar with gradle instead of when running tests. (#840)
* Generate bootstrap jar with gradle instead of when running tests.

* kill all semicolons

* docs

* docs

* ByteCodeTest

* Use latestDepTest classpath for its bootstrap jar

* Rename package

* Reformat comment

* Bootstrap jar absolute path

* Save bootstrap jar to reports dir.

* Debug

* Debug

* Use project.getBuildDir

* Restore

* Revert

* testFieldInjection is instrumentation test too.

* Split out bytecode tests for testing-common

* Apply jacoco configuration to all tests.

* Add note that jacoco may be causing frustration.

* YOLO alert - Hope my guess at the reason is correct

* Apply suggestions from code review

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-08-02 10:17:52 +09:00
dengliming d362691100
Use new exporter public constants in spring boot starters (#863) 2020-08-01 10:01:09 -07:00
Trask Stalnaker 48da19b8a1
Faster spotless (#844) 2020-07-31 12:30:21 -07:00
Anuraag Agrawal d092125ed4
Use dependson instead of finalizedby for integrationTest (#848) 2020-07-31 08:23:47 +03:00
Trask Stalnaker f4ada08c49
Use default zipkin endpoint from otel-java (#837) 2020-07-30 11:56:35 -07:00
Helen Y b659ee8223
Apply new database semantic attributes (#823) 2020-07-28 17:31:33 -07:00
Trask Stalnaker 48ef644c90
Run integrationTest as part of test (#817) 2020-07-28 15:21:40 +09:00
Munir Abdinur 03dce2ab2a
Create exporter starters (#815) 2020-07-27 22:19:30 -07:00
Anuraag Agrawal 91f8e8c199
Use archivesBaseName when publishing. (#809)
* Use archivesBaseName when publishing.

* Fix auto name
2020-07-27 15:01:55 +03:00
Anuraag Agrawal 688733ad43
Update OTel snapshot to 723 for recordException (#786)
* Update OTel snapshot to 723 for recordException

* Fix various servlet issues

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-07-27 14:32:05 +09:00
Anuraag Agrawal 5fa1efd38c
Target OTel SDK snapshot (#746) 2020-07-22 10:37:56 -07:00
Nikita Salnikov-Tarnovski fcf4319aac
Faster tests (#725)
🎉
2020-07-22 10:10:34 -07:00
Anuraag Agrawal d8355c672d
Docs for writing new instrumentation... (#652)
* Docs for writing new instrumentation
2020-07-19 14:21:19 +09:00
Alexey Zhokhov f3421e91a0
Remove Lombok (#672)
* Gradle 6.5.1.

* Skip download javadoc and sources automatically in IntelliJ IDEA.

* Added mavenLocal to repositories.

* Removed Lombok usage.

* Removed duplicated idea config.

* Code format.

* Removed useless usage of Objects.requireNonNull.

* Use instanceof to comparing objects.

* Code format.

* Code format.

* Fixes after merge.

* Fixed sneakyThrow exception.

* Code format.
2020-07-18 15:52:55 +03:00
Nikita Salnikov-Tarnovski ac200720c8
Allows actually consume published instrumentation artifacts (#692) 2020-07-14 15:09:17 +03:00
Nikita Salnikov-Tarnovski d96a771dd0
Update to otel-java 0.6.0 (#662)
* Working against otel-java 0.6.0-SNAPSHOT

* Muzzle fix

* Better comment

* Now works with otel-java 0.6.0

* Fix muzzle
2020-07-11 09:10:28 +03:00
Nikita Salnikov-Tarnovski b77fb267f3
Gradle warnings (#659)
* More gradle warnings fixes

* Disable javadoc where it is definitely not needed

* Polish
2020-07-10 07:57:54 +03:00
Anuraag Agrawal 8f3b7565b0
Shade AWS instrumentation library when using in agent (#644)
* Shade AWS instrumentation library when using in agent

* Cleanup and doc

* spotless
2020-07-08 12:36:55 +09:00
Nikita Salnikov-Tarnovski a62801649f
More fixes for Gradle warnings (#643)
* More gradle deprecation warnings fixed

* More gradle deprecation warnings fixed

* More fixes

* More fixes

Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
2020-07-07 15:02:07 +03:00
Björn Antonsson 91ad9965d3 Make build fail on spotless differences (DataDog/dd-trace-java#1627) 2020-06-30 11:15:50 -07:00
Tyler Benson 4a943c8411 Use Spotless for formatting (DataDog/dd-trace-java#1619) 2020-06-30 11:15:48 -07:00
Sergei Malafeev 5f70b521b7
#560 Consolidate src/main/java8 and src/main/java9 into src/main/java (#617)
Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
2020-06-30 16:34:59 +03:00
Nikita Salnikov-Tarnovski de1fb295cb
Now publish all instrumentations as well. (#565)
* Now publish all instrumentations as well.

Changed groupId to `io.opentelemetry.instrumentation`.
Removed `opentelemetry` from auto-exporters' artifactIds.
Some instrumentations will need moving around to have better names, e.g. servlets. Should I do it right away?

* Polish

* Unify names of published artifacts

* Renamed some modules

* Fix CI config

* Rename project-reactor back to reactor
2020-06-27 08:57:24 +03:00
Anuraag Agrawal 874b157fe5
Newline between license and package. (#581) 2020-06-25 13:31:16 -07:00
Nikita Salnikov-Tarnovski 9a52f6708e
Gradle dependencies cleanup (#556)
* Bootstrap fixed

* Tooling fixed

* Testing fixed

* All instrumentation tests pass

* All tests pass

* Fix test

* Muzzle workaround

* Muzzle fix

* Update instrumentation/trace-annotation/trace-annotation.gradle

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-06-24 12:01:14 +03:00
Nikolay Martynov 84d4e24989 Upgradle gradle to 6.5 (DataDog/dd-trace-java#1589) 2020-06-23 14:08:46 -07:00
Anuraag Agrawal 9a2a0b5de9
Add lettuce 5.2 instrumentation that uses lettuce's native tracing functionality. (#535)
* Copy Lettuce 5.0 to start 5.1 instrumentation

* Begin tracing adapter implementation

Co-authored-by: Dustin Neray <dustin.neray@gmail.com>

* Set floor to 5.2 instead

* Move around

* Finish

* Cleanups

* Instrument 5.1+ instead

* Cleanup

* 5.1

* Remove latestDepTest from lettuce-5.0 since we have a newer lettuce-5.1.

* Remove

* Remove package check

* Spotless

Co-authored-by: Dustin Neray <dustin.neray@gmail.com>
2020-06-18 18:22:45 +03:00
Nikita Salnikov-Tarnovski dbb639a56d
Don't deploy releases to Artifactory (#527) 2020-06-15 22:20:01 +03:00
Tyler Benson 1b29184e7c Make rootDir usage consistent (DataDog/dd-trace-java#1518) 2020-06-11 10:14:02 -07:00
Tyler Benson f2bf50684a Use Retry.Mode.SETUP_FEATURE_CLEANUP to improve Elasticsearch test flakiness (DataDog/dd-trace-java#1494) 2020-06-11 10:12:11 -07:00
Nikita Salnikov-Tarnovski ae03d88c20
Enable publishing to Artifactory OSS (#489) 2020-06-10 07:34:09 +03:00
Nikita Salnikov-Tarnovski 31177c2fa9
Disable publishing to Artifactory OSS until it is properly configured on JFrog side (#486) 2020-06-09 20:57:34 +03:00
Nikita Salnikov-Tarnovski c248f140aa
Artifactory and bintray publish (#403)
* Artifactory and bintray publish

* Delegate version management to Nebula

* Proposal of new release process

* New CI jobs for releasing

* Fix nebula versioning

* Polish

* Fix CI

* Publish snapshot from master must depend on test_8

* Fix repo name

* Restore version file creation

* Use correct env variable for Bintray credentials

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-06-09 07:56:12 +03:00
Nikita Salnikov-Tarnovski 1c59062aae
0.5.0 (#476)
* Update to otel-java 0.5.0-SNAPSHOT (#462)

* Update to otel-java 0.5.0-SNAPSHOT

* Tests pass

* Check fix

* Switch to otel-java 0.5.0

* Add TODOs
2020-06-05 20:11:49 +03:00
Trask Stalnaker 96fa7b8c31
Merge changes from dd-trace-java 0.53.0 (#456)
* Add time in queue (DataDog/dd-trace-java#1481)

* Minor upgrades (DataDog/dd-trace-java#1495)

* Allow user to disable kafka time in queue tag (DataDog/dd-trace-java#1487)

* Replace Set<Integer> with BitSet for HTTP statuses (DataDog/dd-trace-java#1496)

* Register WeakMapProvider earlier in AgentInstaller (DataDog/dd-trace-java#1480)

* Update codenarc (DataDog/dd-trace-java#1500)

Co-authored-by: Tyler Benson <tyler.benson@datadoghq.com>
Co-authored-by: Nikolay Martynov <mar.kolya@gmail.com>
Co-authored-by: Richard Startin <richard.startin@datadoghq.com>
2020-06-02 18:20:54 +03:00
Trask Stalnaker 015be46ec2
Remove unnecessary version constant (#455) 2020-05-31 06:31:38 +03:00
Trask Stalnaker 359eb07445
Updates to reflect new repo name (#454) 2020-05-30 11:56:12 -07:00
Anuraag Agrawal d4a14f6b98
Separate out core instrumentation for AWS SDK to allow manual setup o… (#421)
* Separate out core instrumentation for AWS SDK to allow manual setup of instrumentation.

* Instrumentation core test
2020-05-27 10:43:56 -07:00
Nikolay Martynov a16b519176 Update gradle to 6.4 (DataDog/dd-trace-java#1443) 2020-05-26 11:54:55 -07:00
Sergei Malafeev 7ea2da3d0b
Add Zipkin exporter support (#411)
* #375 Add Zipkin exporter support

Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>

* #375 use OkHttpSender for Zipkin exporter

Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>

* #375 add Zipkin exporter to README

Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-05-19 15:58:41 -07:00
Sergei Malafeev 2308c69875
upgrade opentelemetry to 0.4.1 (#410)
Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>
2020-05-18 10:40:01 -07:00
Carlos Alberto Cortez 009cc6ad1e
Initial Propagators support. (#389) 2020-05-14 16:57:52 -07:00
Nikita Salnikov-Tarnovski 6cfe2256ef
Use java 11 for compilation (#390)
* Allow compiling of everything with java 11

* Instruct CircleCI to use java 11 be default

* Forbid running some tests on java11

* Muzzle uses ClassLoader.platformClassLoader as parent for user-space classloader
2020-05-14 15:13:30 -07:00
Tyler Benson ca27485a5c Upgrade Byte Buddy to 1.10.10 (DataDog/dd-trace-java#1409) 2020-05-14 11:50:30 -07:00
Tyler Benson 5ecd8cb81e Add instrumentation for okhttp 2.2+ (DataDog/dd-trace-java#1402) 2020-05-14 11:50:27 -07:00
Nikita Salnikov-Tarnovski c9cf7ffb61
Make auto-instr work with latest otel-java snapshot (#372)
* Make auto-instr work with latest otel-java snapshot

* Add CircleCI workflow to run nightly test job against otel-java snapshot

* Decrease snapshot versions cache time

* Add comments suggest during review

* Add comments suggest during review

* Add missed helper class

* Use released otel-java 0.4.0

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-05-04 23:18:39 -07:00
John Bley ca296b92fd
Normalize sql statements to elide literal numbers and strings. (#366)
* Normalize sql statements to elide literal numbers and strings.

* Missed one SlickTest sql normalization.

* Fix muzzle order for helper classes.

* Change name of feature flag

* Upgrade to latest spotless version in an attempt #1 to make the circleci build work.

* Attempt 2 to make circleci build happy - exclude build/generated/** from spotless.

* Attempt 3 to get circleci build working, adding *.java to the exclude line.

* Change exclude of generated files to include of just the src/ directory.
I confirmed that this properly failed the build if I remove a license header from a src/ directory.
2020-05-04 12:17:55 -07:00
Nikita Salnikov-Tarnovski 62426c8158
Allows `./gradlew clean build` to run successfully. (#355)
* CI job `check` will run `build` gradle task
2020-04-29 08:08:14 -07:00
Nikita Salnikov-Tarnovski 6e1c0436da
Clarifications about various test tasks (#358)
In addition this commit replaces eager tasks generation for running tests using different java versions with rule based task created on-demand.
2020-04-28 18:11:17 -07:00
Trask Stalnaker 62e43d3e54
Bring back code coverage verification (#357) 2020-04-28 15:27:44 -07:00
Trask Stalnaker f9e74ac9c6
Fix some sporadic test failures (#354)
* Fix some sporadic test failures

* Improve Jetty test advice

* Fix smore sporadic test failures

* Improve test consistency
2020-04-27 11:40:27 -07:00
Trask Stalnaker ce3d764ffa Merge commit '437e0f343dcd66ac344556c03bd340ce791b1fdd' into correct-history 2020-04-21 12:55:51 -07:00
Nikolay Martynov f267931794
Merge pull request #1382 from DataDog/mar-kolya/increase-test-timeout
Increase gradle test timeout
2020-04-20 14:27:56 -04:00
Jaroslav Bachorik eb272bcc00
Add exception sampling event (#1297) 2020-04-20 16:31:54 +02:00
Nikolay Martynov 377036efd4
typo fixes
Co-Authored-By: Jaroslav Bachorik <jaroslav.bachorik@datadoghq.com>
2020-04-20 08:35:23 -04:00
Nikolay Martynov 2e48634934 Increase gradle test timeout 2020-04-20 08:29:06 -04:00
Trask Stalnaker ecc26226dc Merge tag 'v0.49.0' into dd-merge 2020-04-18 16:00:00 -07:00
Nikolay Martynov 95810488e4 Merge branch 'master' into mar-kolya/upgrade-statsd 2020-04-17 11:47:17 -04:00
Nikolay Martynov 0d11207123 update groovy 2020-04-17 10:38:47 -04:00
Nikolay Martynov 5f9bd1e082 update kotlin 2020-04-17 10:37:00 -04:00
Nikolay Martynov 20bbc6d9da update junit5 2020-04-17 10:36:01 -04:00
Nikolay Martynov 2fc06d9c85 update slf4j 2020-04-17 10:34:34 -04:00
Nikolay Martynov 1ec76d68b7 update okhttp 2020-04-17 10:33:50 -04:00
Nikolay Martynov 00ac902a8f Include specific unixsocket lib version into shared jar 2020-04-17 09:56:26 -04:00
Nikolay Martynov ad0960a922 Use newer version of statsd client 2020-04-17 09:36:22 -04:00
Trask Stalnaker 1f0cd54fd7
Remove copyright year from license header (#322)
* Update template

* Apply template
2020-04-15 11:24:44 -07:00
Trask Stalnaker d24159c8d2 Merge tag 'v0.48.0' into dd-merge 2020-04-12 15:20:10 -07:00
Trask Stalnaker c545ffa3c2 Merge tag 'v0.47.0' into dd-merge 2020-04-06 13:26:15 -07:00
Nikolay Martynov 2870819fa6 Update gradle to 6.3 2020-04-06 08:08:03 -04:00
Trask Stalnaker f0354033b2
Add OTLP exporter (#289) 2020-03-29 20:33:07 -07:00
Trask Stalnaker 2e210683fd
Update to OpenTelemetry API/SDK 0.3.0 (#286)
* Update gradle dependencies and module name

* Replace Tracer.withSpan() with currentContextWith()

* Update inject to 0.3.0

* Update extract to 0.3.0

* More updates

* Remove distributedcontext package refs

* Update OpenTelemetry API interoperability

* No need to call setNoParent()

setParent(SpanContext.getInvalid()) should give the same result.
2020-03-28 19:38:51 -07:00
Pontus Rydin ff47bf04cd
Use sdk_contrib exporter glue (#285) 2020-03-27 11:23:14 -07:00
Brian Devins-Suresh 89a0761ab4 Add typesafe repo and skip bad builds 2020-03-26 10:10:31 -04:00
Nikolay Martynov 021d3c9d1d
Merge pull request #1330 from DataDog/mar-kolya/update-gradle
Update gradle to 6.2.2
2020-03-23 14:23:30 -04:00
Nikolay Martynov eadba156d5 Update groovy vertion
Old one doesn't seem to work with java14
2020-03-23 12:54:51 -04:00
Nikolay Martynov 6574c6f8b6 Run profiling tests on zulu8 2020-03-23 08:04:15 -04:00
Nikolay Martynov 8c7e3dd4b6 Update gradle to 6.2.2 2020-03-23 08:02:51 -04:00
Trask Stalnaker 396baa69d6
Update OpenTelemetry API/SDK (#257)
* Update dependency version

* Change getTracerFactory to getTracerProvider

* Update some imports

* Change put to set

* Fix up bridge

* Update package names

* Update test SpanProcessor

* Remove null conditionals around setAttribute

* Update shading

* Update span context extraction
2020-03-20 14:13:55 -07:00
Trask Stalnaker 2298885678 Merge tag 'v0.46.0' into dd-merge 2020-03-16 11:25:27 -07:00
Trask Stalnaker cba031ddcb
Rename hibernate modules (#205)
* Rename hibernate modules

* Update tracer name

* Change from gradle inheritance to composition

This will make it possible to have empty "grouping" modules, e.g.
instrumentation:hibernate.

* Introduce empty hibernate grouping module
2020-03-09 15:33:21 -07:00
John Bley 00ae1eca3d
Integrate SpotBugs into build (ignoreFailures=true), fix most found issues (#216)
* Integrate SpotBugs (FindBugs) into build.  Set ignoreFailures so spotted bugs do not break the build.

* Fix many SpotBugs-found items, mostly making things final, but also a redundant null check and a reliance on platform character encoding.  2 items remain which will need further work/review, but as ignoreFailures is set, they will not fail the check stage.

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-03-09 10:47:49 -07:00
Trask Stalnaker 40e3932358
Add license headers (#188)
* Add spotless gradle plugin

* Add license headers
2020-02-27 13:24:42 -08:00
Trask Stalnaker 8ee04d54e9 Merge remote-tracking branch 'datadog/master' into dd-merge 2020-02-22 14:35:03 -08:00
Trask Stalnaker c43f3229c6 Merge commit '25534b2641ff57e0de36fb359a412612ef349ee9' into dd-merge-part-2 2020-02-12 17:59:03 -08:00
Nikolay Martynov 23d3b75555
Merge pull request #1211 from DataDog/profiling-release
Support JFR profiling
2020-02-11 22:51:19 -05:00
Nikolay Martynov e266c1357d update gradle to 6.1.1 2020-02-11 15:09:09 -05:00
Nikolay Martynov fd58187994 Support JFR profiling 2020-02-11 14:55:19 -05:00
Laplie Anderson c28bf2180e
Merge pull request #1199 from DataDog/landerson/shared-classloader
Shared classloader for agent and jmx-fetch
2020-02-11 13:48:01 -05:00
Nikolay Martynov 05c2d6e947 Fix the way jacoco defaults are set 2020-02-11 12:05:06 -05:00
Laplie Anderson c79fe3a459 Create shared internal jar 2020-02-11 11:44:46 -05:00
Tyler Benson 75c7769192 Reduce tracer thread count by combining scheduled executors into a single executor.
Pulls out utility classes for reuse by other projects.

This also meant the dependency had to be bundled with dd-trace-ot since it isn't published as a separate dependency.
2020-02-10 10:45:58 -08:00
Tyler Benson cab139e905 Upgrade OkHttp client to 3.12.8 2020-02-04 15:06:44 -08:00
Pontus Rydin bec7775d56
Fixed error handling when Java version can't be determined (#118)
* Fixed error handling when Java version can't be determined

* Made build getJavaExecutableVersion more resilient to output variations
2020-02-03 12:38:21 -08:00
Trask Stalnaker 147b42d1ff Merge tag 'v0.42.0' 2020-02-01 13:28:58 -08:00
Pontus Rydin 49e6309cf9
Experimental Jaeger integration (#115)
* Added simple exporter

* Updated config prefix
2020-02-01 12:22:25 -08:00
Tyler Benson 697d4972a8 Remove Jackson from dd-trace-ot
Reduced the size of dd-java-agent jar by about 2 MB. Jackson is not removed completely though as it is still a dependency of jmxfetch.

Trace serialization is primarily done directly with msgpack.
Response deserialization and LoggingWriter serialization is done with mochi.

Msgpack Serialization buffer still not being reused though.
2020-01-31 15:59:43 -05:00
Nikolay Martynov 950389587c Simplify groovy/scala/kotlin compile dependency hack 2020-01-23 09:40:15 -05:00
Nikolay Martynov be6a7730bf Update kotlin version 2020-01-23 09:40:15 -05:00
Nikolay Martynov bc72b9271a Update gradle to 6.1 2020-01-23 08:39:06 -05:00
Trask Stalnaker 819ca7c256
Simplify directory/module structure (#77)
* Move things up a directory

* Scripted mass update

find -type f -name "*.gradle" | xargs sed -i 's/:java-agent:/:/g'

* Remove plugin version now that it's in root module

* Update java-agent and instrumentation configs

* Misc
2020-01-22 13:55:47 -08:00
Tyler Benson f9e43516ad Set timeouts on individual tests and increase overall test timeout. 2020-01-22 09:06:03 -08:00
Trask Stalnaker c47f92c6b0 Merge tag 'v0.41.0' into dd-merge 2020-01-15 21:50:25 -08:00
Laplie Anderson e351ce523c Update bytebuddy to 1.10.6 2020-01-15 10:40:46 -05:00
Trask Stalnaker 71d264fd00
Rename package to io.opentelemetry.auto (#54)
* Remove publishing info

* Remove Datadog-Meta-Lang handling

* Misc renames

* Rename DD_ constant field names

* Rename DDSpanTypes to SpanTypes

* Rename DDTags to MoreTags

* Rename DDSpecification to AgentSpecification

* Rename DDLocationStrategy to AgentLocationStrategy

* Rename DDCachingPoolStrategy to AgentCachingPoolStrategy

* Rename DDTransformers to AgentTransformers

* Script: rename datadog.trace to io.opentelemetry.auto

find -wholename */datadog/trace -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry/auto \;

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/datadog\.trace\./io.opentelemetry.auto./g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/datadog\/trace\//io\/opentelemetry\/auto\//g'

find -type f -name "*.gradle" | xargs sed -i 's/datadog\.trace\./io.opentelemetry.auto./g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\/trace\//io\/opentelemetry\/auto\//g'

* Script: rename more packages

find -wholename */datadog/test -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/smoketest -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/perftest -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/benchmark -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/loadgenerator -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;

# keep these outside of io.opentelemetry.auto for now at least (things under io.opentelemetry.auto are not instrumented)
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.test\b/io.opentelemetry.test/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.smoketest\b/io.opentelemetry.smoketest/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.perftest\b/io.opentelemetry.perftest/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.benchmark\b/io.opentelemetry.benchmark/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.loadgenerator\b/io.opentelemetry.loadgenerator/g'

# ok to move this into io.opentelemetry.auto
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.slf4j\b/io.opentelemetry.auto.slf4j/g'

find -type f -name "*.gradle" | xargs sed -i 's/datadog\.test\b/io.opentelemetry.test/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.smoketest\b/io.opentelemetry.smoketest/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.perftest\b/io.opentelemetry.perftest/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.benchmark\b/io.opentelemetry.benchmark/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.loadgenerator\b/io.opentelemetry.loadgenerator/g'

find -type f -name "*.gradle" | xargs sed -i 's/datadog\.slf4j\b/io.opentelemetry.auto.slf4j/g'

* Intellij: format and organize imports

* Script: More renaming

find -name *.xml | xargs sed -i 's/<logger name="datadog"/<logger name="io.opentelemetry.auto"/g'
find -name *.java | xargs sed -i 's/LoggerFactory.getLogger("datadog")/LoggerFactory.getLogger("io.opentelemetry.auto")/g'
find -name *.java | xargs sed -i 's/"datadog.span"/"opentelemetry.auto.span"/g'
find -name *.java -o -name *.groovy | xargs sed -i 's/"datadog.doesnotexist"/"io.opentelemetry.auto.doesnotexist"/g'

# keep this outside of io.opentelemetry.auto for now at least (things under io.opentelemetry.auto are not instrumented)
find -name *.yaml | xargs sed -i 's/"datadog.benchmark"/"io.opentelemetry.benchmark"/g'

find -type f -name "*.gradle" | xargs sed -i 's/datadog\.forked/io.opentelemetry.auto.forked/g'
find -name *.yml | xargs sed -i 's/datadog\.forked/io.opentelemetry.auto.forked/g'

* Improve comment

* Script: rename dd- modules

git mv dd-java-agent java-agent
git mv java-agent/dd-java-agent.gradle java-agent/java-agent.gradle
git mv dd-trace-api trace-api
git mv trace-api/dd-trace-api.gradle trace-api/trace-api.gradle
git mv dd-smoke-tests smoke-tests
git mv smoke-tests/dd-smoke-tests.gradle smoke-tests/smoke-tests.gradle

git mv dd-trace-java.gradle trace-java.gradle

find -type f -name "*.gradle" | xargs sed -i 's/\bdd-java-agent\b/java-agent/g'
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-trace-api\b/trace-api/g'
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-smoke-tests\b/smoke-tests/g'

find -type f -name "*.gradle" | xargs sed -i 's/\bdd-trace-java\b/trace-java/g'

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-java-agent\b/java-agent/g'
sed -i 's/\bdd-java-agent\b/java-agent/g' .gitignore

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-trace-api\b/trace-api/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-smoke-tests\b/smoke-tests/g'

* Remove unused config - service.name

* Remove unused config - writer.type

* Remove unused config - trace.partial.flush.min

* Script: rename dd. test packages

find -wholename */dd/trace/instrumentation -exec mkdir -p {}/../../io/opentelemetry/test \; -exec mv {} {}/../../io/opentelemetry/test \;
find -wholename */dd/test/trace/annotation -exec mkdir -p {}/../../io/opentelemetry/test \; -exec mv {} {}/../../io/opentelemetry/test \;

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/dd\.trace\.instrumentation\b/io.opentelemetry.test.instrumentation/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/dd\.test.trace\.annotation\b/io.opentelemetry.test.annotation/g'

* Script: rename dd properties

DD_PROP=opentelemetry.auto
DD_ENV=OPENTELEMETRY_AUTO
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"dd\.\"/\"$DD_PROP.\"/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"DD_\"/\"${DD_ENV}_\"/g"

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.integration\./$DD_PROP.integration./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.integrations\./$DD_PROP.integrations./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_INTEGRATION_/${DD_ENV}_INTEGRATION_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_INTEGRATIONS_/${DD_ENV}_INTEGRATIONS_/g"

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDdd\.trace\./D$DD_PROP.trace./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_TRACE_/${DD_ENV}_TRACE_/g"

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.logs\./$DD_PROP.logs./g"

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.trace_id\b/$DD_PROP.trace_id/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.span_id\b/$DD_PROP.span_id/g"

find -type f -name "*.gradle" | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"
find -type f -name "*.properties" | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"

# test code
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.prop\./$DD_PROP.prop./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.float\./$DD_PROP.float./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.garbage\./$DD_PROP.garbage./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.negative\./$DD_PROP.negative./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_ENV_/${DD_ENV}_ENV_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_FLOAT_/${DD_ENV}_FLOAT_/g"

# test code
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"is-dd-server\"/\"is-test-server\"/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bisDDServer\b/isTestServer/g"

* Rename dd-java-tracer.properties to java-tracer.properties

* Rename DDTracingUtil to OpenTelemetryTracingUtil

* Codec.java was removed already

* Rename __datadog to __opentelemetry

* Misc renames

* Script: remove redundant sub-package

find -wholename */io/opentelemetry/auto/agent -exec bash -c "mv {}/* {}/.." \;
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/io\.opentelemetry\.auto\.agent\b/io.opentelemetry.auto/g'

find -type f -name "*.gradle" | xargs sed -i 's/io\.opentelemetry\.auto\.agent\b/io.opentelemetry.auto/g'

find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/io\/opentelemetry\/auto\/agent\b/io\/opentelemetry\/auto/g'

* Shorten logging config keys
2020-01-14 13:57:01 -08:00
Trask Stalnaker 64fd99862a
Use OpenTelemetry API (#51)
* Remove dd-trace-ot

* Remove disableShadowRelocate

* Remove GlobalTracer and ScopeListener

* Comment out instr depending on activeScope

* OpenTelemetry implementation

* Update instrumentation tests to pass

* Update test infrastruture

* Update spring-webflux instrumentation

* Update jax-rs-annotation instrumentation

* Fix ratpack failing test
2020-01-13 16:51:36 -08:00
Nikolay Martynov d96d8e3c71 Upgrade gradle 2020-01-13 14:46:06 -05:00
Trask Stalnaker 71cd1a69b3
Remove OpenTracing interoperability (#44)
* Remove dependency on OpenTracing constants

* Remove OpenTracing tracer resolver

* Remove dep on OpenTracing Tracer and GlobalTracer

* Remove dep on OpenTracing ScopeManager/Context

* Remove dep on OpenTracing References

* Remove dep on OpenTracing Format

* Remove dep on OpenTracing Scope

* Remove dep on OpenTracing Span

* Remove OpenTracing compatibility tests

* Remove dep on OpenTracing SpanContext

* Remove dep on OpenTracing propagation classes

* Remove dep on OpenTracing log field name constants

* Remove dependency on OpenTracing

* Some last OpenTracing related renaming

* Remove unused code

* Remove code that's not doing anything

* A bit more cleanup
2019-12-18 10:17:50 -08:00
Tyler Benson 92069fd498 Merge changes from dd-trace-java 0.39.0
https://github.com/DataDog/dd-trace-java/releases/tag/v0.39.0

# Conflicts:
#	dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
#	dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
#	dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
#	dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
#	dd-java-agent/instrumentation/dropwizard/dropwizard-views/src/test/groovy/ViewRenderTest.groovy
#	dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
#	dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
#	dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
#	dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy
#	dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
#	dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/CriteriaTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/QueryTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/SessionTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/CriteriaTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/QueryTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/SessionTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/ProcedureCallTest.groovy
#	dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy
#	dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy
#	dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy
#	dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
#	dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy
#	dd-java-agent/instrumentation/jax-rs-annotations-1/src/test/groovy/JerseyTest.groovy
#	dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy
#	dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy
#	dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
#	dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy
#	dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy
#	dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
#	dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy
#	dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
#	dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy
#	dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy
#	dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy
#	dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy
#	dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
#	dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
#	dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
#	dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
#	dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy
#	dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
#	dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
#	dd-java-agent/instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy
#	dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/SpringWebfluxTest.groovy
#	dd-java-agent/instrumentation/spring-webflux-5/src/test/groovy/dd/trace/instrumentation/springwebflux/client/SpringWebfluxHttpClientTest.groovy
#	dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
#	dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy
#	dd-java-agent/instrumentation/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy
#	dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy
#	dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceConfigTest.groovy
#	dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy
#	dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy
#	dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
#	dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy
#	dd-trace-ot/src/main/java/datadog/opentracing/ContainerInfo.java
#	dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
#	dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
#	dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy
#	dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy
2019-12-16 09:22:10 -08:00
Trask Stalnaker 80f7f615e4
Remove exporter (#25) 2019-12-02 12:14:44 -08:00
Sean C. Sullivan 458527ca4c bytebuddy 1.10.4
Docs: https://github.com/raphw/byte-buddy/releases
2019-11-29 13:51:55 -05:00
Tyler Benson 4dde3a4445 Merge changes from dd-trace-java 0.38.0
https://github.com/DataDog/dd-trace-java/releases/tag/v0.38.0
2019-11-22 16:33:38 -08:00
Trask Stalnaker d86632d648
Remove jmxfetch module (#13) 2019-11-18 17:24:37 -08:00
Nikolay Martynov 2c4422aa04 Upgradle to gradle 6.0 2019-11-12 16:26:46 -05:00
Nikolay Martynov 7b43aa12d0 Update some dependencies 2019-11-11 08:14:52 -05:00
Tyler Benson d30ada42e9 Update byte-buddy to 1.10.2 2019-11-06 15:53:10 -08:00
Tyler Benson 00fe40f1fb
Merge pull request #1026 from trask/dd-next
Thoughts for after #1020
2019-10-25 09:20:24 -07:00
Nikolay Martynov 8236b94d44 Update gradle to 5.6.3 2019-10-25 08:09:48 -04:00
Trask Stalnaker 8c558fa00e Format 2019-10-24 21:05:01 -07:00
Tyler Benson 557d45a9fe Changes required for OT 0.32
This seems backwards compatable with 0.31 since all changes are additional, so this should be safe.
2019-10-17 13:54:56 -07:00
Tyler Benson a6200f96c3 Upgrade Jackson to 2.10.0
This is primarily motivated by new CVE’s.

Upgrade jmxfetch to 0.32.1 which has the same change.
2019-10-09 12:04:45 +02:00
Tyler Benson 9ef3332140 Extract base test class and move Config class changes there. 2019-10-07 18:51:25 +02:00
Nikolay Martynov 8e75eeb506 Update bytebuddy to 1.10.1 2019-10-07 08:27:13 -04:00
Laplie Anderson 07b58e1cf4
Merge pull request #957 from DataDog/landerson/instrumentation-module-check
Java 9 Modules Smoketest
2019-09-10 19:56:12 -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
Laplie Anderson be60d362ae Manually call jlink because plugin won't work with our build 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