Trask Stalnaker
62c604f2f5
Format java files in standalone projects ( #4105 )
2021-09-13 16:16:25 +09:00
Trask Stalnaker
2d79e6a6ef
Upgrade all gradle wrappers ( #4107 )
...
* Upgrade all gradle wrappers
* Add doc
2021-09-13 16:16:10 +09:00
Nikita Salnikov-Tarnovski
fc39d87c82
Remove JCenter which is about to be sunset ( #2387 )
...
* Remove JCenter which is about to be sunset
* Fallback to JCenter for muzzle
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Fixing muzzle without jcenter
* Remove debug logs
* polish
2021-03-19 23:21:52 +02:00
Trask Stalnaker
475830789c
Update to otel-java 1.0.0 ( #2431 )
...
* Update to otel-java 1.0.0
* Fix test
* Fix another test
* Fix another test
* Fix hibernate tests
* Fix spring-data tests
* Spotless
2021-02-28 11:15:27 -08:00
Anuraag Agrawal
8bba7ac364
Update smoke tests to 0.17.0 ( #2327 )
2021-02-18 15:49:09 +09:00
Mateusz Rzeszutek
15a9d0f113
Update smoke tests for logging changes ( #2312 ) ( #2316 )
2021-02-18 11:46:00 +09:00
Anuraag Agrawal
b0a7aa1ae8
Update smoke tests to released 0.16.0 ( #2228 )
2021-02-09 15:07:10 +09:00
Anuraag Agrawal
ef1c250deb
Update spring boot smoke test code too ( #2219 )
2021-02-08 15:57:47 +09:00
Anuraag Agrawal
29dd296d7a
Update smoke tests to 0.16.0-SNAPSHOT ( #2218 )
2021-02-08 15:44:28 +09:00
Anuraag Agrawal
0a74799419
Update smoke tests to SDK 0.15.0 ( #2136 )
2021-01-29 16:59:13 +09:00
Anuraag Agrawal
47a4061078
Update smoke tests to SDK 0.14.1 ( #2043 )
2021-01-13 22:22:30 -08:00
Anuraag Agrawal
b72e4a9a53
Update smoke tests to released 0.13.1 ( #1933 )
2020-12-18 12:50:26 +09:00
Anuraag Agrawal
7f3d6c3321
Update smoke tests to 0.13.0-SNAPSHOT ( #1923 )
2020-12-17 15:42:50 +09:00
Anuraag Agrawal
32cfc26cfc
Bump smoke tests to SDK 0.12.0 ( #1832 )
2020-12-04 22:02:27 +09:00
Nikita Salnikov-Tarnovski
71f1a79100
Introduce test matrix ( #1821 )
...
* Introduce test matrix and proper WildFly test
* Restore test to old version until matrix is merged
* Add workflow to publish test matrix
* Satisfy checkstyle
* Polish
* Use docker build args instead of replacing tokens
2020-12-03 12:34:45 +02:00
Nikita Salnikov-Tarnovski
483d477e67
Fix port used for self-call ( #1807 )
2020-11-30 16:21:39 +02:00
Anuraag Agrawal
3475cbd77d
Migrate test docker images to GHCR. ( #1790 )
2020-11-30 09:15:42 +02:00
Nikita Salnikov-Tarnovski
2222905aa2
Preparation for e2e propagators test ( #1781 )
2020-11-27 21:57:21 +02:00
Anuraag Agrawal
7bfb6b6dbd
Update to SDK 0.11.0 ( #1690 )
2020-11-19 19:37:49 -08:00
Anuraag Agrawal
53529d3028
Use released 0.10.0 in smoke test containers. ( #1634 )
2020-11-14 15:27:28 -08:00
Anuraag Agrawal
6c1dabf782
Tag smoke test images with date and run ID from workflow. ( #1559 )
...
* Tag smoke test images with sha from workflow.
* Pass tag as date from workflow
* Echo tag which is nice to see in logs
* Add run ID
* Remove seconds
* Missed files
2020-11-05 19:11:29 +09:00
Vladimir Šor
caf102fe15
Tag docker images for smoke tests with date and time. ( #1553 )
2020-11-05 00:02:33 +09:00
Anuraag Agrawal
c6eee70660
Update to latest snapshot. ( #1524 )
2020-10-29 18:54:09 -07:00
Anuraag Agrawal
a2dccf2316
Update to latest SDK snapshot. ( #1479 )
2020-10-26 19:29:46 -07: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
Mateusz Rzeszutek
c45a8cd432
Add smoke test for Logback MDC instrumentation - Spring Boot app changes ( #1228 )
2020-09-21 17:51:23 +03:00
Anuraag Agrawal
83a5714a97
Use a fake OTLP backend for storing smoke tests traces instead of fil… ( #1136 )
...
* Use a fake OTLP backend for storing smoke tests traces instead of file exporter.
* Newlines
* Newlines
* Bins
2020-08-31 15:17:51 +09:00
Nikita Salnikov-Tarnovski
89577a168a
Switch to Bintray Docker repo ( #959 )
...
* Debugging jib failures
* Debugging jib failures
* Switching to Bintray Docker
* Switching to Bintray Docker
* Switching to Bintray Docker
2020-08-13 10:16:08 +03:00
Nikita Salnikov-Tarnovski
51e06100ca
Run smoke tests on different java versions ( #948 )
...
* Run smoke tests on different java versions
* Cleaner Docker images names
2020-08-12 20:32:23 +03: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
Trask Stalnaker
2c786ab1a1
Fix WithSpan annotation instrumentation ( #929 )
2020-08-09 21:46:50 -07:00
Trask Stalnaker
5dc2ca350a
Update config property prefix from ota to otel ( #841 )
...
* Update config property prefix from ota to otel
* more
* format
* more
2020-07-31 08:29:29 +03: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
Anuraag Agrawal
874b157fe5
Newline between license and package. ( #581 )
2020-06-25 13:31:16 -07:00
Tyler Benson
1b29184e7c
Make rootDir usage consistent ( DataDog/dd-trace-java#1518 )
2020-06-11 10:14:02 -07:00
Nikita Salnikov-Tarnovski
9f44348217
Embed exporters into agent jar ( #491 )
...
* Embed all exporters into agent jar
* Publish agent with exporters and without
* Polish
2020-06-11 09:41:11 +03:00
Rashmi
109d684152
Configured trace config to read from env vars/sys props ( #479 )
...
* Configured trace config to read from env vars/sys props
* Fixed the codenarc violation
* Addressing review comments
1. Updated span count target to num_tries in the test since SpanCounter stops counting spans as soon as it hits the targets
* Extracted the configure method outside of installExportersFromJar
* Addressing comments
2020-06-08 09:54:18 +03: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
96f89ecc48
Span name should not have http method ( #279 )
2020-03-23 09:52:20 -07:00
Trask Stalnaker
5089a05c44
Better span names for spring-webmvc ( #245 )
2020-03-19 19:00:38 -07:00
Han Zhang
5b1218cdb8
Update instrumentation to be compliant with HTTP semantic conventions ( #227 )
...
* Update HTTP client-side span names
* Add query and fragment to http.url for HTTP client spans
* Add query and fragment to http.url for HTTP server spans
* Update HTTP server span names to be the matched route or resource
* Use net.peer.* instead of peer.* attributes
2020-03-12 18:49:52 -07:00
Trask Stalnaker
b2db595430
Merge tag 'v0.45.0' into dd-merge
2020-03-05 21:49:39 -08:00
Trask Stalnaker
40e3932358
Add license headers ( #188 )
...
* Add spotless gradle plugin
* Add license headers
2020-02-27 13:24:42 -08:00
Pontus Rydin
239eb53a44
Removed statically loaded exporters and added more tests ( #171 )
...
* Classloader done. Still needs shading
* First working version
* Made the dummy exporter slightly less stupid
* Use SPI pattern for loading. Added runtime shader
* Changed to do shading on binary stream instead of loading the class first
* Protected the runtime shader from having its internals shaded
* Cleaned up code and naming
* Cleaned up
* Cleaned up and fixed test issues
* Minor fixes from code review
* Added exporter smoke tests
* Finalized exporter smoke tests
* Reenabled springboot test
* Fixed some copy-paste issues
* Initial work on exporter bridges
* Implemented dynamically loaded exporter adapters
* Added some more files
* Added exporter-adapters for well-known exporters
Moved dummy-exporter to exporter adapters
Removed -Dota.exporter option in favor of ota.exporter.jar
Added basic exporter tests to smoketest
Increased timeout for Finatra server start to help with parallel test execution
* Cleaned up tests, removed dead code and updated README
* Update README.md
* Update README.md
* Removed references to gRPC dependencies needed by Jaeger
* Fixed incorrect use of ServiceLoader in test
* Fixed test dependencies
* Adjusted exporter tests
* Fixed codeNarc issues
* Fixed CircleCI issues
* Added tests to check what CircleCI is doing
* Added missing logging directory
* Removed deadline() from Jaeger factory
* Another attempt to make it pass CircleCI
* Fixed some minor codeNarc issues
* Wrapped test config in doFirst
* Change forEach -> each
* Removed README section about commercial exporters
* Reduced number of changes to Config
* Fixed field reordering issue
* Removed references to dummy exporter
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-02-21 15:12:48 -08: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
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