Skip to content

Commit 2fb7dba

Browse files
lzchenlzchen
authored
Move opentracing-shim folder out of instrumentation folder (open-telemetry#1533)
1 parent 89fb4e5 commit 2fb7dba

Some content is hidden

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

60 files changed

+31
-35
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions

‎docs/conf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
if isdir(join(exp, f))
3636
]
3737

38-
instr = "../instrumentation"
39-
instr_dirs = [
40-
os.path.abspath("/".join(["../instrumentation", f, "src"]))
41-
for f in listdir(instr)
42-
if isdir(join(instr, f))
38+
shim = "../shim"
39+
shim_dirs = [
40+
os.path.abspath("/".join(["../shim", f, "src"]))
41+
for f in listdir(shim)
42+
if isdir(join(shim, f))
4343
]
4444

45-
sys.path[:0] = source_dirs + exp_dirs + instr_dirs
45+
sys.path[:0] = source_dirs + exp_dirs + shim_dirs
4646

4747
# -- Project information -----------------------------------------------------
4848

‎docs/examples/opentracing/README.rst

Lines changed: 3 additions & 3 deletions

‎docs/examples/opentracing/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
from opentelemetry import trace
66
from opentelemetry.exporter.jaeger import JaegerSpanExporter
7-
from opentelemetry.instrumentation import opentracing_shim
87
from opentelemetry.sdk.trace import TracerProvider
98
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
9+
from opentelemetry.shim import opentracing_shim
1010

1111
# Configure the tracer using the default implementation
1212
trace.set_tracer_provider(TracerProvider())

‎docs/index.rst

Lines changed: 3 additions & 4 deletions

‎docs/instrumentation/instrumentation.rst renamed to ‎docs/shim/instrumentation.rst

‎docs/instrumentation/instrumentor.rst renamed to ‎docs/shim/instrumentor.rst

‎docs/instrumentation/metric.rst renamed to ‎docs/shim/metric.rst

‎docs/instrumentation/opentracing_shim/opentracing_shim.rst renamed to ‎docs/shim/opentracing_shim/opentracing_shim.rst

Lines changed: 1 addition & 1 deletion

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/LICENSE renamed to ‎shim/opentelemetry-opentracing-shim/LICENSE

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/MANIFEST.in renamed to ‎shim/opentelemetry-opentracing-shim/MANIFEST.in

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/README.rst

Lines changed: 1 addition & 1 deletion

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg renamed to ‎shim/opentelemetry-opentracing-shim/setup.cfg

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py renamed to ‎shim/opentelemetry-opentracing-shim/setup.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717

1818
BASE_DIR = os.path.dirname(__file__)
1919
VERSION_FILENAME = os.path.join(
20-
BASE_DIR,
21-
"src",
22-
"opentelemetry",
23-
"instrumentation",
24-
"opentracing_shim",
25-
"version.py",
20+
BASE_DIR, "src", "opentelemetry", "shim", "opentracing_shim", "version.py",
2621
)
2722
PACKAGE_INFO = {}
2823
with open(VERSION_FILENAME) as f:

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
from opentelemetry import trace
3232
from opentelemetry.sdk.trace import TracerProvider
33-
from opentelemetry.instrumentation.opentracing_shim import create_tracer
33+
from opentelemetry.shim.opentracing_shim import create_tracer
3434
3535
# Define which OpenTelemetry Tracer provider implementation to use.
3636
trace.set_tracer_provider(TracerProvider())
@@ -102,8 +102,8 @@
102102
from opentelemetry import propagators
103103
from opentelemetry.baggage import get_baggage, set_baggage
104104
from opentelemetry.context import Context, attach, detach, get_value, set_value
105-
from opentelemetry.instrumentation.opentracing_shim import util
106-
from opentelemetry.instrumentation.opentracing_shim.version import __version__
105+
from opentelemetry.shim.opentracing_shim import util
106+
from opentelemetry.shim.opentracing_shim.version import __version__
107107
from opentelemetry.trace import INVALID_SPAN_CONTEXT, DefaultSpan, Link
108108
from opentelemetry.trace import SpanContext as OtelSpanContext
109109
from opentelemetry.trace import Tracer as OtelTracer

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/util.py renamed to ‎shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/util.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py renamed to ‎shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/test_shim.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import opentracing
2323

2424
from opentelemetry import propagators, trace
25-
from opentelemetry.instrumentation.opentracing_shim import (
25+
from opentelemetry.sdk.trace import TracerProvider
26+
from opentelemetry.shim.opentracing_shim import (
2627
SpanContextShim,
2728
SpanShim,
2829
create_tracer,
2930
util,
3031
)
31-
from opentelemetry.sdk.trace import TracerProvider
3232
from opentelemetry.test.mock_textmap import (
3333
MockTextMapPropagator,
3434
NOOPTextMapPropagator,
@@ -137,7 +137,7 @@ def test_explicit_start_time(self):
137137
with self.shim.start_active_span("TestSpan4", start_time=now) as scope:
138138
result = util.time_seconds_from_ns(scope.span.unwrap().start_time)
139139
# Tolerate inaccuracies of less than a microsecond. See Note:
140-
# https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html
140+
# https://open-telemetry.github.io/opentelemetry-python/opentelemetry.shim.opentracing_shim.html
141141
# TODO: This seems to work consistently, but we should find out the
142142
# biggest possible loss of precision.
143143
self.assertAlmostEqual(result, now, places=6)
@@ -151,7 +151,7 @@ def test_explicit_end_time(self):
151151

152152
end_time = util.time_seconds_from_ns(span.unwrap().end_time)
153153
# Tolerate inaccuracies of less than a microsecond. See Note:
154-
# https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html
154+
# https://open-telemetry.github.io/opentelemetry-python/opentelemetry.shim.opentracing_shim.html
155155
# TODO: This seems to work consistently, but we should find out the
156156
# biggest possible loss of precision.
157157
self.assertAlmostEqual(end_time, now, places=6)
@@ -431,7 +431,7 @@ def test_log_kv(self):
431431
)
432432
self.assertEqual(span.unwrap().events[1].attributes["foo"], "bar")
433433
# Tolerate inaccuracies of less than a microsecond. See Note:
434-
# https://open-telemetry.github.io/opentelemetry-python/instrumentation/opentracing_shim/opentracing_shim.html
434+
# https://open-telemetry.github.io/opentelemetry-python/shim/opentracing_shim/opentracing_shim.html
435435
# TODO: This seems to work consistently, but we should find out the
436436
# biggest possible loss of precision.
437437
self.assertAlmostEqual(result, now, places=6)

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/test_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import time
1616
import unittest
1717

18-
from opentelemetry.instrumentation.opentracing_shim import util
18+
from opentelemetry.shim.opentracing_shim import util
1919
from opentelemetry.util import time_ns
2020

2121

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import opentelemetry.instrumentation.opentracing_shim as opentracingshim
1+
import opentelemetry.shim.opentracing_shim as opentracingshim
22
from opentelemetry.sdk import trace
33
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
44
from opentelemetry.sdk.trace.export.in_memory_span_exporter import (

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/testcase.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/testcase.py

File renamed without changes.

‎instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/utils.py renamed to ‎shim/opentelemetry-opentracing-shim/tests/testbed/utils.py

File renamed without changes.

‎tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ changedir =
7878
test-core-proto: opentelemetry-proto/tests
7979
test-core-instrumentation: opentelemetry-instrumentation/tests
8080
test-core-getting-started: docs/getting_started/tests
81-
test-core-opentracing-shim: instrumentation/opentelemetry-instrumentation-opentracing-shim/tests
81+
test-core-opentracing-shim: shim/opentelemetry-opentracing-shim/tests
8282

8383
test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests
8484
test-exporter-opencensus: exporter/opentelemetry-exporter-opencensus/tests
@@ -111,7 +111,7 @@ commands_pre =
111111
exporter-jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger
112112

113113
opentracing-shim: pip install {toxinidir}/opentelemetry-sdk
114-
opentracing-shim: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim
114+
opentracing-shim: pip install {toxinidir}/shim/opentelemetry-opentracing-shim
115115

116116
zipkin: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin
117117

@@ -159,7 +159,7 @@ commands_pre =
159159
python -m pip install -e {toxinidir}/opentelemetry-sdk[test]
160160
python -m pip install -e {toxinidir}/opentelemetry-proto[test]
161161
python -m pip install -e {toxinidir}/tests/util[test]
162-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim[test]
162+
python -m pip install -e {toxinidir}/shim/opentelemetry-opentracing-shim[test]
163163
python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger[test]
164164
python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus[test]
165165
python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test]

0 commit comments

Comments
 (0)