Rename package to io.opentelemetry.auto #54

trask · 2020-01-14T19:37:56Z

Closes #7

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'

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'

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'

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'

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'

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"

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'

tylerbenson · 2020-01-14T19:55:04Z

java-agent/instrumentation/rxjava-1/src/main/java/rx/__OpenTelemetryTracingUtil.java

@@ -3,7 +3,7 @@
 /**
 * This class must be in the rx package in order to access the package accessible onSubscribe field.
 */
-public class DDTracingUtil {
+public class __OpenTelemetryTracingUtil {


Why prefixed?

I was being excessively(?) worried about conflicting with something rxjava (or someone else) might add into the rx. package in the future

It sort of matches the convention of prefixing field names with __opentelemetry when we inject fields into other peoples classes.

The name is also weird tho, I will change it to OpenTelemetryTracingUtil if you think that's better.

TBH, it doesn't really matter to me. I can live with it either way.

tylerbenson · 2020-01-14T19:56:23Z

...t-tooling/src/main/java/io/opentelemetry/auto/agent/tooling/log/LogContextScopeListener.java

-  private static final String TRACE_ID_KEY = "dd.trace_id";
-  private static final String SPAN_ID_KEY = "dd.span_id";
+  private static final String TRACE_ID_KEY = "opentelemetry.auto.trace_id";
+  private static final String SPAN_ID_KEY = "opentelemetry.auto.span_id";


This key will be used in logging config. I suggest keeping it short. ot.trace_id should be sufficient.

👍 I will push this change

open-telemetry#54)

trask added 27 commits January 14, 2020 11:36

Remove publishing info

5b30003

Remove Datadog-Meta-Lang handling

a40d3aa

Misc renames

cc83b74

Rename DD_ constant field names

ecc6cc7

Rename DDSpanTypes to SpanTypes

be38190

Rename DDTags to MoreTags

a414b6a

Rename DDLocationStrategy to AgentLocationStrategy

84823f7

Rename DDCachingPoolStrategy to AgentCachingPoolStrategy

b0d5538

Rename DDTransformers to AgentTransformers

1d0d603

Rename DDSpecification to AgentSpecification

3befde7

Intellij: format and organize imports

6528d67

Improve comment

edf4b5e

Remove unused config - service.name

43e016e

Remove unused config - writer.type

8fbb361

Remove unused config - trace.partial.flush.min

70ed193

Rename dd-java-tracer.properties to java-tracer.properties

8ac21e0

Rename DDTracingUtil to OpenTelemetryTracingUtil

ae925d4

Codec.java was removed already

2707fa0

Rename __datadog to __opentelemetry

ab392a2

Misc renames

f9669f6

trask requested review from jkwatson, safris and tylerbenson as code owners January 14, 2020 19:37

tylerbenson reviewed Jan 14, 2020

View reviewed changes

Shorten logging config keys

64349d2

tylerbenson approved these changes Jan 14, 2020

View reviewed changes

trask merged commit 71d264f into open-telemetry:master Jan 14, 2020

trask deleted the rename branch January 14, 2020 21:57

schmikei pushed a commit to schmikei/opentelemetry-java-instrumentation that referenced this pull request Apr 17, 2025

Clarify process.runtime.jvm.threads.count refers to platform threads (

62513fb

open-telemetry#54)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename package to io.opentelemetry.auto #54

Rename package to io.opentelemetry.auto #54

trask commented Jan 14, 2020

tylerbenson Jan 14, 2020

trask Jan 14, 2020

trask Jan 14, 2020

tylerbenson Jan 14, 2020

tylerbenson Jan 14, 2020

trask Jan 14, 2020

Rename package to io.opentelemetry.auto #54

Rename package to io.opentelemetry.auto #54

Conversation

trask commented Jan 14, 2020

tylerbenson Jan 14, 2020

Choose a reason for hiding this comment

trask Jan 14, 2020

Choose a reason for hiding this comment

trask Jan 14, 2020

Choose a reason for hiding this comment

tylerbenson Jan 14, 2020

Choose a reason for hiding this comment

tylerbenson Jan 14, 2020

Choose a reason for hiding this comment

trask Jan 14, 2020

Choose a reason for hiding this comment