diff --git a/CHANGELOG.md b/CHANGELOG.md index 2197bd9f54f..a4b55712f3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#1516](https://github.com/open-telemetry/opentelemetry-python/pull/1516)) - `opentelemetry-exporter-zipkin` Update boolean attribute value transformation ([#1509](https://github.com/open-telemetry/opentelemetry-python/pull/1509)) +- Move opentelemetry-opentracing-shim out of instrumentation folder + ([#1533](https://github.com/open-telemetry/opentelemetry-python/pull/1533)) - `opentelemetry-sdk` The JaegerPropagator has been moved into its own package: `opentelemetry-propagator-jaeger` ([#1525](https://github.com/open-telemetry/opentelemetry-python/pull/1525)) diff --git a/docs/conf.py b/docs/conf.py index 0d06bffec18..1da52b4a6d3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -35,14 +35,14 @@ if isdir(join(exp, f)) ] -instr = "../instrumentation" -instr_dirs = [ - os.path.abspath("/".join(["../instrumentation", f, "src"])) - for f in listdir(instr) - if isdir(join(instr, f)) +shim = "../shim" +shim_dirs = [ + os.path.abspath("/".join(["../shim", f, "src"])) + for f in listdir(shim) + if isdir(join(shim, f)) ] -sys.path[:0] = source_dirs + exp_dirs + instr_dirs +sys.path[:0] = source_dirs + exp_dirs + shim_dirs # -- Project information ----------------------------------------------------- diff --git a/docs/examples/opentracing/README.rst b/docs/examples/opentracing/README.rst index f56bd3e5fcd..da9c70e43b8 100644 --- a/docs/examples/opentracing/README.rst +++ b/docs/examples/opentracing/README.rst @@ -1,8 +1,8 @@ OpenTracing Shim Example ========================== -This example shows how to use the :doc:`opentelemetry-instrumentation-opentracing-shim -package <../../instrumentation/opentracing_shim/opentracing_shim>` +This example shows how to use the :doc:`opentelemetry-opentracing-shim +package <../../shim/opentracing_shim/opentracing_shim>` to interact with libraries instrumented with `opentracing-python `_. @@ -100,6 +100,6 @@ Useful links ------------ - OpenTelemetry_ -- :doc:`../../instrumentation/opentracing_shim/opentracing_shim` +- :doc:`../../shim/opentracing_shim/opentracing_shim` .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/ diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py index bff9a7c3da8..7de4b33730c 100755 --- a/docs/examples/opentracing/main.py +++ b/docs/examples/opentracing/main.py @@ -4,9 +4,9 @@ from opentelemetry import trace from opentelemetry.exporter.jaeger import JaegerSpanExporter -from opentelemetry.instrumentation import opentracing_shim from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor +from opentelemetry.shim import opentracing_shim # Configure the tracer using the default implementation trace.set_tracer_provider(TracerProvider()) diff --git a/docs/index.rst b/docs/index.rst index 5a6a3a77159..eb62e6a0092 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -73,7 +73,6 @@ install api/api sdk/sdk - instrumentation/instrumentation .. toctree:: :maxdepth: 2 @@ -85,11 +84,11 @@ install .. toctree:: :maxdepth: 2 - :caption: OpenTelemetry Instrumentations - :name: Instrumentations + :caption: OpenTelemetry Shims + :name: Shims :glob: - instrumentation/** + shim/** .. toctree:: :maxdepth: 1 diff --git a/docs/instrumentation/instrumentation.rst b/docs/shim/instrumentation.rst similarity index 100% rename from docs/instrumentation/instrumentation.rst rename to docs/shim/instrumentation.rst diff --git a/docs/instrumentation/instrumentor.rst b/docs/shim/instrumentor.rst similarity index 100% rename from docs/instrumentation/instrumentor.rst rename to docs/shim/instrumentor.rst diff --git a/docs/instrumentation/metric.rst b/docs/shim/metric.rst similarity index 100% rename from docs/instrumentation/metric.rst rename to docs/shim/metric.rst diff --git a/docs/instrumentation/opentracing_shim/opentracing_shim.rst b/docs/shim/opentracing_shim/opentracing_shim.rst similarity index 60% rename from docs/instrumentation/opentracing_shim/opentracing_shim.rst rename to docs/shim/opentracing_shim/opentracing_shim.rst index fad4e04bbec..175a10e8605 100644 --- a/docs/instrumentation/opentracing_shim/opentracing_shim.rst +++ b/docs/shim/opentracing_shim/opentracing_shim.rst @@ -1,5 +1,5 @@ OpenTracing Shim for OpenTelemetry ================================== -.. automodule:: opentelemetry.instrumentation.opentracing_shim +.. automodule:: opentelemetry.shim.opentracing_shim :no-show-inheritance: diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/LICENSE b/shim/opentelemetry-opentracing-shim/LICENSE similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/LICENSE rename to shim/opentelemetry-opentracing-shim/LICENSE diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/MANIFEST.in b/shim/opentelemetry-opentracing-shim/MANIFEST.in similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/MANIFEST.in rename to shim/opentelemetry-opentracing-shim/MANIFEST.in diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst b/shim/opentelemetry-opentracing-shim/README.rst similarity index 83% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst rename to shim/opentelemetry-opentracing-shim/README.rst index 7a8413ef59d..455634858c0 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst +++ b/shim/opentelemetry-opentracing-shim/README.rst @@ -16,5 +16,5 @@ Installation References ---------- -* `OpenTracing Shim for OpenTelemetry `_ +* `OpenTracing Shim for OpenTelemetry `_ * `OpenTelemetry Project `_ diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg rename to shim/opentelemetry-opentracing-shim/setup.cfg diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py b/shim/opentelemetry-opentracing-shim/setup.py similarity index 88% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py rename to shim/opentelemetry-opentracing-shim/setup.py index f5d71a86b56..b8a95207135 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py +++ b/shim/opentelemetry-opentracing-shim/setup.py @@ -17,12 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, - "src", - "opentelemetry", - "instrumentation", - "opentracing_shim", - "version.py", + BASE_DIR, "src", "opentelemetry", "shim", "opentracing_shim", "version.py", ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py similarity index 99% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py rename to shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py index 65727ed5594..74c8952664e 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py +++ b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py @@ -30,7 +30,7 @@ from opentelemetry import trace from opentelemetry.sdk.trace import TracerProvider - from opentelemetry.instrumentation.opentracing_shim import create_tracer + from opentelemetry.shim.opentracing_shim import create_tracer # Define which OpenTelemetry Tracer provider implementation to use. trace.set_tracer_provider(TracerProvider()) @@ -102,8 +102,8 @@ from opentelemetry import propagators from opentelemetry.baggage import get_baggage, set_baggage from opentelemetry.context import Context, attach, detach, get_value, set_value -from opentelemetry.instrumentation.opentracing_shim import util -from opentelemetry.instrumentation.opentracing_shim.version import __version__ +from opentelemetry.shim.opentracing_shim import util +from opentelemetry.shim.opentracing_shim.version import __version__ from opentelemetry.trace import INVALID_SPAN_CONTEXT, DefaultSpan, Link from opentelemetry.trace import SpanContext as OtelSpanContext from opentelemetry.trace import Tracer as OtelTracer diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/util.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/util.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/util.py rename to shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/util.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py rename to shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/__init__.py b/shim/opentelemetry-opentracing-shim/tests/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py b/shim/opentelemetry-opentracing-shim/tests/test_shim.py similarity index 99% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py rename to shim/opentelemetry-opentracing-shim/tests/test_shim.py index 151ca07ba9e..54f1caa92c5 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py +++ b/shim/opentelemetry-opentracing-shim/tests/test_shim.py @@ -22,13 +22,13 @@ import opentracing from opentelemetry import propagators, trace -from opentelemetry.instrumentation.opentracing_shim import ( +from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.shim.opentracing_shim import ( SpanContextShim, SpanShim, create_tracer, util, ) -from opentelemetry.sdk.trace import TracerProvider from opentelemetry.test.mock_textmap import ( MockTextMapPropagator, NOOPTextMapPropagator, @@ -137,7 +137,7 @@ def test_explicit_start_time(self): with self.shim.start_active_span("TestSpan4", start_time=now) as scope: result = util.time_seconds_from_ns(scope.span.unwrap().start_time) # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.shim.opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(result, now, places=6) @@ -151,7 +151,7 @@ def test_explicit_end_time(self): end_time = util.time_seconds_from_ns(span.unwrap().end_time) # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.shim.opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(end_time, now, places=6) @@ -431,7 +431,7 @@ def test_log_kv(self): ) self.assertEqual(span.unwrap().events[1].attributes["foo"], "bar") # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/instrumentation/opentracing_shim/opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/shim/opentracing_shim/opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(result, now, places=6) diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py b/shim/opentelemetry-opentracing-shim/tests/test_util.py similarity index 97% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py rename to shim/opentelemetry-opentracing-shim/tests/test_util.py index 806a8da609b..7e34c1ac05b 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py +++ b/shim/opentelemetry-opentracing-shim/tests/test_util.py @@ -15,7 +15,7 @@ import time import unittest -from opentelemetry.instrumentation.opentracing_shim import util +from opentelemetry.shim.opentracing_shim import util from opentelemetry.util import time_ns diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py b/shim/opentelemetry-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py similarity index 92% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py index c12bbfa0291..6ed5818e34e 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py +++ b/shim/opentelemetry-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py @@ -1,4 +1,4 @@ -import opentelemetry.instrumentation.opentracing_shim as opentracingshim +import opentelemetry.shim.opentracing_shim as opentracingshim from opentelemetry.sdk import trace from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_client_server/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst b/shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py b/shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/testcase.py b/shim/opentelemetry-opentracing-shim/tests/testbed/testcase.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/testcase.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/testcase.py diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/utils.py b/shim/opentelemetry-opentracing-shim/tests/testbed/utils.py similarity index 100% rename from instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/utils.py rename to shim/opentelemetry-opentracing-shim/tests/testbed/utils.py diff --git a/tox.ini b/tox.ini index 788c4ef85ad..3ef615bb7e0 100644 --- a/tox.ini +++ b/tox.ini @@ -78,7 +78,7 @@ changedir = test-core-proto: opentelemetry-proto/tests test-core-instrumentation: opentelemetry-instrumentation/tests test-core-getting-started: docs/getting_started/tests - test-core-opentracing-shim: instrumentation/opentelemetry-instrumentation-opentracing-shim/tests + test-core-opentracing-shim: shim/opentelemetry-opentracing-shim/tests test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests test-exporter-opencensus: exporter/opentelemetry-exporter-opencensus/tests @@ -111,7 +111,7 @@ commands_pre = exporter-jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger opentracing-shim: pip install {toxinidir}/opentelemetry-sdk - opentracing-shim: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim + opentracing-shim: pip install {toxinidir}/shim/opentelemetry-opentracing-shim zipkin: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin @@ -159,7 +159,7 @@ commands_pre = python -m pip install -e {toxinidir}/opentelemetry-sdk[test] python -m pip install -e {toxinidir}/opentelemetry-proto[test] python -m pip install -e {toxinidir}/tests/util[test] - python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim[test] + python -m pip install -e {toxinidir}/shim/opentelemetry-opentracing-shim[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test]