open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,424 Commits 77 Branches 113 Tags 276 MiB
Commit Graph

102 Commits

Author SHA1 Message Date
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
Trask Stalnaker 62e43d3e54
Bring back code coverage verification (#357) 2020-04-28 15:27:44 -07:00
Trask Stalnaker 486d7cce62
Add auto-exporter shadowJars to build (#331) 2020-04-16 16:53:27 -07:00
Trask Stalnaker c545ffa3c2 Merge tag 'v0.47.0' into dd-merge 2020-04-06 13:26:15 -07:00
Trask Stalnaker 750a979331
Save CircleCI artifacts needed for release (#293) 
* Save CircleCI artifacts needed for release

* Build and test otlp exporter
 2020-03-29 21:38:34 -07:00
Nikolay Martynov eeac035164 Test with jdk14 on CI 2020-03-23 12:38:21 -04:00
Tyler Benson d45682427b Change circleci config to version 2.1 2020-03-16 12:29:49 -07:00
Trask Stalnaker 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
Trask Stalnaker ae15d717ad
Change prefix in couple of other places (#127) 2020-02-05 13:45:26 -08:00
Trask Stalnaker 3a4b2a9b95
Reduce CircleCI cost (#129) 2020-02-05 13:01:03 -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
Trask Stalnaker 80f7f615e4
Remove exporter (#25) 2019-12-02 12:14:44 -08:00
Trask Stalnaker 289e2b41ec Fix CircleCI muzzle build running out of memory 2019-11-27 12:37:43 -08:00
Trask Stalnaker 662e1792bb
Fix CircleCI muzzle build running out of memory (#29) 2019-11-27 12:36:03 -08:00
Nikolay Martynov 06a895672a Revert "Disable zulu8 test for time being due to test incompatibility" 
This reverts commit 0b4b07b3f8.
 2019-11-06 10:12:42 -05:00
Tyler Benson c1dad60a4c Disable zulu8 test for time being due to test incompatibility 
OkHttp seems to be inadvertently loading the java log manager.
 2019-11-05 14:36:25 -08:00
Nikolay Martynov 44dc98200a Enable tests for java13 2019-09-18 15:36:45 -04:00
Nikolay Martynov 68caf521ff Run tests on zulu11 2019-06-25 11:31:55 -04:00
Nikolay Martynov 808e965c9b Add Zulu to circleci build 2019-06-17 11:26:47 -04:00
Nikolay Martynov f37e4a2ec2 Revert "Collect more debugging info" 
This reverts commit a0fc54936a.
 2019-06-14 11:18:17 -04:00
Nikolay Martynov 5e81ca7913
Merge pull request #879 from DataDog/mar-kolya/preserver-dot-gradle-in-workspace 
Preserve .gradle in workspace
 2019-06-13 15:39:42 -04:00
Nikolay Martynov 709a548925
Merge pull request #877 from DataDog/mar-kolya/collect-jvm-cores 
Collect more debugging info
 2019-06-13 15:38:28 -04:00
Tyler Benson ca57aade8c Run latestDepTests in a separate job 2019-06-13 10:44:19 -07:00
Nikolay Martynov 16709c0954 Preserve .gradle in workspace 2019-06-13 13:25:09 -04:00
Nikolay Martynov a0fc54936a Collect more debugging info 2019-06-13 11:59:37 -04:00
Nikolay Martynov a2a9bec8a8 Enable '**' support in logs collection scripts 
It is disabled by default now
 2019-06-13 10:56:21 -04:00
Nikolay Martynov c1ce3c7103 Add Java12 build 2019-06-06 16:58:18 -04:00
Tyler Benson b6ba1997ae Add constraint for muzzle too 2019-05-17 09:32:15 -07:00
Nikolay Martynov 8f811fef85 Reduce gradle heap size on muzzle task 
Looks like gradle forks more with new compiler settings and we run out
of memory on muzzle task
 2019-03-29 14:34:19 -04:00
Nikolay Martynov 63e0c0f032 Support Unix Domain Socket proxy to send traces 2019-03-15 11:36:44 -07:00
Nikolay Martynov 6a950d4745 Collect JVM crashes in circleci artifacts 
So we could investigate them later.
 2019-02-04 14:35:59 -05:00
Tyler Benson 2971d1b0d3 Ensure the copyMetricConfigs task runs after processResources 
Otherwise there seems to be a race condition which results in the metric config files being overwritten.
 2019-01-28 13:43:07 -08:00
Nikolay Martynov c46763e0cb Enable IBM JVM tests 2018-12-04 17:12:44 -05:00
Gary 51978d877f
remove version scan task from ci 2018-11-26 16:57:10 -05:00
Nikolay Martynov ed5692871d Properly limit heap size for gradle child processes 2018-11-23 09:44:50 -05:00
Andrew Kent 5efd80ea52 Skip buildscan for muzzle CI runs 2018-10-30 20:58:40 -07:00
Nikolay Martynov fa2303ad0a Increase heap size in build 2018-10-24 15:18:58 -04:00
Nikolay Martynov 32bb61824b Reduce java heap for muzzle builds 2018-10-24 14:38:14 -04:00
Nikolay Martynov 14e85941c0
Merge pull request #547 from DataDog/mar-kolya/weak-concurrent-map-thread-cleanup 
Mar kolya/weak concurrent map thread cleanup
 2018-10-23 18:12:24 -04:00
Nikolay Martynov 04ba472e56 Rewrite comment 2018-10-23 17:56:10 -04:00
Nikolay Martynov bfaffb8544 Merge remote-tracking branch 'origin/tyler/worker-count' into mar-kolya/weak-concurrent-map-thread-cleanup 2018-10-23 17:45:53 -04:00
Nikolay Martynov 2fd7858ac2 Tweak muzzle heap size 2018-10-23 16:30:51 -04:00
Nikolay Martynov 191cdef924 Split muzzle and scan versions into two different jobs 2018-10-23 16:03:39 -04:00
Tyler Benson c80d549e46 Attempt to increase worker count to improve build time. 
The build scans are especially slow.
 2018-10-23 18:03:09 +10:00
Tyler Benson 0b55212473 Remove PGP signing from publish task 2018-10-23 08:43:10 +10:00
Tyler Benson 78c6f881ed
Merge pull request #535 from DataDog/tyler/rabbit 
Add instrumentation for RabbitMQ’s AMQP library
 2018-10-19 23:26:50 +10:00
Nikolay Martynov d4d478466a Try reducing number of parallel processes on muzzle testing 
To see if that helps with CI. Also limit heap size there.
 2018-10-17 17:54:33 -04:00
Tyler Benson 8ffeb5bedf Add instrumentation for RabbitMQ’s AMQP library 2018-10-17 16:32:24 +10:00
Nikolay Martynov 1d5cc0bcaa Use custom container to perform builds 2018-10-03 15:12:41 -04:00
Nikolay Martynov f71192266c Rework the way multi-jvm tests work 
To allow some JVMs runs only subset of tests
 2018-10-02 13:20:19 -04:00