86c438b154
Remove final from local variables ( #732 )
...
* Remove final from local variables
2020-07-20 13:53:34 +09:00
d8355c672d
Docs for writing new instrumentation... ( #652 )
...
* Docs for writing new instrumentation
2020-07-19 14:21:19 +09: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
874b157fe5
Newline between license and package. ( #581 )
2020-06-25 13:31:16 -07: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
459c291bca
Allow the mock http server get assigned a transient port ( DataDog/dd-trace-java#1540 )
...
This change should eradicate the spurious test failures due to port conflicts - at least for the profiling smoke tests.
2020-06-23 14:08:44 -07:00
5e9e2539e7
The fattest jar now has `-all` classifier ( #515 )
...
* The fattest jar now has `-all` classifier
* Test fix
2020-06-15 10:12:33 +03:00
e61ff5bac2
Rename auto-exporters' artifacts names ( #514 )
2020-06-14 10:53:51 -07:00
1b29184e7c
Make rootDir usage consistent ( DataDog/dd-trace-java#1518 )
2020-06-11 10:14:02 -07:00
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
357fb6e989
Deduplicate servlets ( #469 )
...
* Servlet instrumentations unified
* Grizzly migrated
* Fix tests after merge
* Polish and fix tests
* Polish and fix tests
* Muzzle fixes
* Muzzle fixes
* Muzzle fixes
* Test fixes
* One more check fixed
* Stop using SpanWithScope
* Test fix
* Compilation fix
* Apply suggestions from code review
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Update agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpServerTracer.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Polish
* Tracer does not manage scope anymore
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-06-08 10:49:58 +03:00
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
c58d259459
Make Retrys consistent ( DataDog/dd-trace-java#1442 )
2020-05-26 11:54:55 -07:00
29a18bdf20
Used BatchSpansProcessor instead of SimpleSpansProcessor ( #393 )
...
BatchSpansProcessor won't get blocked by the exporter.
Fixes #368
2020-05-16 13:18:43 -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
ab0c950140
Update a few last things to otel-java 0.4.0 ( #399 )
2020-05-11 22:17:16 -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
1f0cd54fd7
Remove copyright year from license header ( #322 )
...
* Update template
* Apply template
2020-04-15 11:24:44 -07:00
d24159c8d2
Merge tag 'v0.48.0' into dd-merge
2020-04-12 15:20:10 -07:00
f885f3f645
A few exporter improvements ( #288 )
2020-03-29 08:13:20 -07:00
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
96f89ecc48
Span name should not have http method ( #279 )
2020-03-23 09:52:20 -07:00
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
5089a05c44
Better span names for spring-webmvc ( #245 )
2020-03-19 19:00:38 -07:00
2298885678
Merge tag 'v0.46.0' into dd-merge
2020-03-16 11:25:27 -07:00
cecabe522a
Make tests pass on Windows ( #217 )
2020-03-12 19:42:21 -07:00
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
b2db595430
Merge tag 'v0.45.0' into dd-merge
2020-03-05 21:49:39 -08: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
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
794ccd0e6b
Rename java agent artifact ( #137 )
...
* Fix config to not rely on module alpha order
* Rename java-agent module to opentelemetry-auto
2020-02-06 16:03:24 -08:00
2b11b37d0f
Remove trace-api artifact ( #116 )
...
* Remove unused Trace annotations
* Remove Trace annotation from benchmark code
* Remove Trace annotation from instrumentation tests
* Remove Trace annotation from smoke tests
* Remove Trace annotation from agent tests
* Remove Trace annotation from testing tests
* Remove Trace annotation from hystrix tests
* Remove Trace annotation from netty tests
* Remove Trace annotation from webflux tests
* Remove Trace annotation from reactor tests
* Remove unnecessary conditional
* Remove Trace annotation from trace annotation instrumentation
* Remove Trace annotation from akka http tests
* Remove Trace annotation from java concurrent tests
* Delete Trace annotation
* Move classes out of trace-api
* Remove trace-api artifact
* Move trace-api classes to better packages
2020-02-01 13:07:51 -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
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
Helen Y
Anuraag Agrawal
Alexey Zhokhov
Nikita Salnikov-Tarnovski
Sergei Malafeev
Jaroslav Bachorik
Tyler Benson
Rashmi
Trask Stalnaker
Han Zhang
Pontus Rydin