opentelemetry-java-instrume.../java-agent/instrumentation
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
..
akka-http-10.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
apache-httpasyncclient-4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
apache-httpclient-4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
aws-java-sdk-1.11.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
aws-java-sdk-2.2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
cdi-1.2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
couchbase-2.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
couchbase-2.6 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
datastax-cassandra-3 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
dropwizard Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
elasticsearch Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
glassfish Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
google-http-client Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
grizzly-2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
grpc-1.5 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
hibernate Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
http-url-connection Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
hystrix-1.4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
java-concurrent Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jax-rs-annotations-1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jax-rs-annotations-2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jax-rs-client-1.1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jax-rs-client-2.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jboss-classloading Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jdbc Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jedis-1.4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jedis-3.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jetty-8 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jms Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
jsp-2.3 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
kafka-clients-0.11 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
kafka-streams-0.11 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
lettuce-5 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
log4j1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
log4j2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
mongo Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
netty-4.0 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
netty-4.1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
okhttp-3 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
osgi-classloading Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
play-2.4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
play-2.6 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
play-ws-1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
play-ws-2 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
play-ws-2.1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
rabbitmq-amqp-2.7 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
ratpack-1.4 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
reactor-core-3.1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
rmi Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
rxjava-1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
servlet Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
slf4j-mdc Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
sparkjava-2.3 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
spring-data-1.8 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
spring-webflux-5 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
spring-webmvc-3.1 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
spymemcached-2.12 Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
tomcat-classloading Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
trace-annotation Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
twilio Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
vertx Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00
instrumentation.gradle Rename package to io.opentelemetry.auto (#54) 2020-01-14 13:57:01 -08:00