Skip to content
This repository was archived by the owner on Oct 13, 2021. It is now read-only.

Commit 68293be

Browse files
rename references
The following is the list of references that had been renamed. DATADOG_ -> OPENTELEMETRY_ Datadog -> OpenTelemetry DD_ -> OTEL_ _dd -> _otel ddtrace -> oteltrace _datadog_ -> _opentelemetry_ datadog_ -> opentelemetry_ datadog/foo -> opentelemetry/foo datadog.tracer -> opentelemetry.tracer datadog -> opentelemetry dd_ -> otel_ aotel -> add DDLogger -> OtelLogger dd\.trace -> otel\.trace dd\.span -> otel\.span dd-trace-py -> otel-trace-py dd-trace-py -> otel-trace-py https://github.com/DataDog -> https://github.com/opentelemetry https://github.com/DataDog -> https://github.com/opentelemetry 'http://www.datadog.com/' -> 'http://opentelemetry.io/'
1 parent c6dd1ed commit 68293be

File tree

434 files changed

+1867
-1866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+1867
-1866
lines changed

.circleci/config.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ jobs:
103103
docker:
104104
- <<: *test_runner
105105
env:
106-
TEST_DATADOG_INTEGRATION: 1
106+
TEST_OPENTELEMETRY_INTEGRATION: 1
107107
- image: datadog/docker-dd-agent
108108
env:
109-
- DD_APM_ENABLED=true
110-
- DD_BIND_HOST=0.0.0.0
111-
- DD_API_KEY=invalid_key_but_this_is_fine
109+
- OTEL_APM_ENABLED=true
110+
- OTEL_BIND_HOST=0.0.0.0
111+
- OTEL_API_KEY=invalid_key_but_this_is_fine
112112
resource_class: *resource_class
113113
steps:
114114
- checkout
@@ -139,14 +139,14 @@ jobs:
139139
- *persist_to_workspace_step
140140
- *save_cache_step
141141

142-
ddtracerun:
142+
oteltracerun:
143143
docker:
144144
- *test_runner
145145
- image: redis:4.0-alpine
146146
resource_class: *resource_class
147147
steps:
148148
- checkout
149-
- run: scripts/run-tox-scenario '^py..-ddtracerun$'
149+
- run: scripts/run-tox-scenario '^py..-oteltracerun$'
150150
- *persist_to_workspace_step
151151

152152
test_utils:
@@ -298,9 +298,9 @@ jobs:
298298
- image: memcached:1.5-alpine
299299
- image: datadog/docker-dd-agent
300300
env:
301-
- DD_APM_ENABLED=true
302-
- DD_BIND_HOST=0.0.0.0
303-
- DD_API_KEY=invalid_key_but_this_is_fine
301+
- OTEL_APM_ENABLED=true
302+
- OTEL_BIND_HOST=0.0.0.0
303+
- OTEL_API_KEY=invalid_key_but_this_is_fine
304304
resource_class: *resource_class
305305
steps:
306306
- checkout
@@ -849,7 +849,7 @@ workflows:
849849
- dbapi:
850850
requires:
851851
- flake8
852-
- ddtracerun:
852+
- oteltracerun:
853853
requires:
854854
- flake8
855855
- django:
@@ -983,7 +983,7 @@ workflows:
983983
- celery
984984
- consul
985985
- dbapi
986-
- ddtracerun
986+
- oteltracerun
987987
- django
988988
- elasticsearch
989989
- falcon

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# dd-trace-py
1+
# otel-trace-py
22

3-
[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-py/tree/master.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-py/tree/master)
4-
[![Pyversions](https://img.shields.io/pypi/pyversions/ddtrace.svg?style=flat)](https://pypi.org/project/ddtrace/)
5-
[![PypiVersions](https://img.shields.io/pypi/v/ddtrace.svg)](https://pypi.org/project/ddtrace/)
3+
[![CircleCI](https://circleci.com/gh/DataDog/otel-trace-py/tree/master.svg?style=svg)](https://circleci.com/gh/DataDog/otel-trace-py/tree/master)
4+
[![Pyversions](https://img.shields.io/pypi/pyversions/oteltrace.svg?style=flat)](https://pypi.org/project/oteltrace/)
5+
[![PypiVersions](https://img.shields.io/pypi/v/oteltrace.svg)](https://pypi.org/project/oteltrace/)
66

7-
`ddtrace` is Datadog's tracing library for Python. It is used to trace requests
7+
`oteltrace` is OpenTelemetry's tracing library for Python. It is used to trace requests
88
as they flow across web servers, databases and microservices so that developers
99
have great visiblity into bottlenecks and troublesome requests.
1010

Rakefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ namespace :pypi do
3636
end
3737

3838
task :confirm do
39-
ddtrace_version = get_version
39+
oteltrace_version = get_version
4040

41-
if get_branch.downcase != 'tags/v#{ddtrace_version}'
42-
print "WARNING: Expected current commit to be tagged as 'tags/v#{ddtrace_version}, instead we are on '#{get_branch}', proceed anyways [y|N]? "
41+
if get_branch.downcase != 'tags/v#{oteltrace_version}'
42+
print "WARNING: Expected current commit to be tagged as 'tags/v#{oteltrace_version}, instead we are on '#{get_branch}', proceed anyways [y|N]? "
4343
$stdout.flush
4444

4545
abort if $stdin.gets.to_s.strip.downcase != 'y'
4646
end
4747

48-
puts "WARNING: This task will build and release new wheels to https://pypi.org/project/ddtrace/, this action cannot be undone"
49-
print " To proceed please type the version '#{ddtrace_version}': "
48+
puts "WARNING: This task will build and release new wheels to https://pypi.org/project/oteltrace/, this action cannot be undone"
49+
print " To proceed please type the version '#{oteltrace_version}': "
5050
$stdout.flush
5151

52-
abort if $stdin.gets.to_s.strip.downcase != ddtrace_version
52+
abort if $stdin.gets.to_s.strip.downcase != oteltrace_version
5353
end
5454

5555
task :clean do

ddtrace/contrib/pylons/constants.py

-1
This file was deleted.

ddtrace/contrib/pyramid/constants.py

-6
This file was deleted.

ddtrace/contrib/redis/tracers.py

-20
This file was deleted.

ddtrace/contrib/tornado/constants.py

-9
This file was deleted.

ddtrace/internal/README.md

-7
This file was deleted.

docker-compose.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ services:
7676
ddagent:
7777
image: datadog/agent-dev:gbbr-apm-build
7878
environment:
79-
- DD_BIND_HOST=0.0.0.0
80-
- DD_API_KEY=invalid_key_but_this_is_fine
81-
- DD_APM_RECEIVER_SOCKET=/tmp/ddagent/trace.sock
79+
- OTEL_BIND_HOST=0.0.0.0
80+
- OTEL_API_KEY=invalid_key_but_this_is_fine
81+
- OTEL_APM_RECEIVER_SOCKET=/tmp/ddagent/trace.sock
8282
ports:
8383
- "127.0.0.1:8126:8126"
8484
volumes:
@@ -97,15 +97,15 @@ services:
9797
image: datadog/docker-library:ddtrace_py
9898
environment:
9999
- TOX_SKIP_DIST=True
100-
- TEST_DATADOG_INTEGRATION=1
101-
- TEST_DATADOG_INTEGRATION_UDS=1
100+
- TEST_OPENTELEMETRY_INTEGRATION=1
101+
- TEST_OPENTELEMETRY_INTEGRATION_UDS=1
102102
network_mode: host
103103
working_dir: /src
104104
volumes:
105105
- ddagent:/tmp/ddagent
106-
- ./ddtrace:/src/ddtrace:ro
107-
# DEV: Make ddtrace/vendor rw so Tox can build C-extensions
108-
- ./ddtrace/vendor:/src/ddtrace/vendor:rw
106+
- ./oteltrace:/src/oteltrace:ro
107+
# DEV: Make oteltrace/vendor rw so Tox can build C-extensions
108+
- ./oteltrace/vendor:/src/oteltrace/vendor:rw
109109
- ./tests:/src/tests:ro
110110
- ./setup.cfg:/src/setup.cfg:ro
111111
- ./setup.py:/src/setup.py:ro

docs/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ qthelp:
9191
@echo
9292
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
9393
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
94-
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/ddtrace.qhcp"
94+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/oteltrace.qhcp"
9595
@echo "To view the help file:"
96-
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ddtrace.qhc"
96+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/oteltrace.qhc"
9797

9898
.PHONY: applehelp
9999
applehelp:
@@ -110,8 +110,8 @@ devhelp:
110110
@echo
111111
@echo "Build finished."
112112
@echo "To view the help file:"
113-
@echo "# mkdir -p $$HOME/.local/share/devhelp/ddtrace"
114-
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ddtrace"
113+
@echo "# mkdir -p $$HOME/.local/share/devhelp/oteltrace"
114+
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/oteltrace"
115115
@echo "# devhelp"
116116

117117
.PHONY: epub

0 commit comments

Comments
 (0)