bf9c160570
Rename javaagent modules ( #952 )
2020-08-12 22:50:14 -07:00
d778297b55
Only retry tests in CI ( #950 )
2020-08-13 07:53:19 +09:00
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
275fab6ea5
Retry all tests ( #941 )
2020-08-11 00:20:47 -07:00
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
48ef644c90
Run integrationTest as part of test ( #817 )
2020-07-28 15:21:40 +09:00
fcf4319aac
Faster tests ( #725 )
...
🎉
2020-07-22 10:10:34 -07:00
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
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
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
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
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
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
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
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
359eb07445
Updates to reflect new repo name ( #454 )
2020-05-30 11:56:12 -07:00
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
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
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
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
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
62e43d3e54
Bring back code coverage verification ( #357 )
2020-04-28 15:27:44 -07:00
ce3d764ffa
Merge commit '437e0f343dcd66ac344556c03bd340ce791b1fdd' into correct-history
2020-04-21 12:55:51 -07:00
377036efd4
typo fixes
...
Co-Authored-By: Jaroslav Bachorik <jaroslav.bachorik@datadoghq.com>
2020-04-20 08:35:23 -04:00
2e48634934
Increase gradle test timeout
2020-04-20 08:29:06 -04:00
d24159c8d2
Merge tag 'v0.48.0' into dd-merge
2020-04-12 15:20:10 -07:00
c545ffa3c2
Merge tag 'v0.47.0' into dd-merge
2020-04-06 13:26:15 -07:00
89a0761ab4
Add typesafe repo and skip bad builds
2020-03-26 10:10:31 -04:00
6574c6f8b6
Run profiling tests on zulu8
2020-03-23 08:04:15 -04:00
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
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
40e3932358
Add license headers ( #188 )
...
* Add spotless gradle plugin
* Add license headers
2020-02-27 13:24:42 -08:00
8ee04d54e9
Merge remote-tracking branch 'datadog/master' into dd-merge
2020-02-22 14:35:03 -08:00
c43f3229c6
Merge commit '25534b2641ff57e0de36fb359a412612ef349ee9' into dd-merge-part-2
2020-02-12 17:59:03 -08:00
fd58187994
Support JFR profiling
2020-02-11 14:55:19 -05:00
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
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
147b42d1ff
Merge tag 'v0.42.0'
2020-02-01 13:28:58 -08:00
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
f9e43516ad
Set timeouts on individual tests and increase overall test timeout.
2020-01-22 09:06:03 -08:00
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
8c558fa00e
Format
2019-10-24 21:05:01 -07:00
3a7dcf3dcd
Build java9-modules project with a jdk >= 9
2019-09-10 10:45:34 -04:00
be60d362ae
Manually call jlink because plugin won't work with our build
2019-09-04 13:11:03 -04:00
8ba79db208
Disable task if version is too low. Include all sourcesets in jars
2019-09-04 13:11:03 -04:00
457410ea4e
Run all tests on all java version
2019-09-03 13:03:16 -04:00
e69edaec14
Remove project config centrally defined and other misc cleanup
2019-08-22 12:43:13 -07:00
7fc5132ea6
Add support for forcing JDK to run tests on
2019-06-17 11:25:13 -04:00
597055fca3
Fix typo
2019-06-06 16:55:39 -04:00
fd43210e07
Add task timeout for tests.
2019-05-23 17:13:40 -07:00
Trask Stalnaker
Anuraag Agrawal
Nikita Salnikov-Tarnovski
Alexey Zhokhov
Sergei Malafeev
Tyler Benson
Anuraag Agrawal
Nikolay Martynov
Nikolay Martynov
Brian Devins-Suresh
John Bley
Pontus Rydin
Laplie Anderson