From 92115517b7a06876d77b174d1eadcb2394192aef Mon Sep 17 00:00:00 2001 From: Yusuke Tsutsumi Date: Tue, 30 Jun 2020 09:40:55 -0700 Subject: [PATCH] instrument: moving auto-instrumentation to a submodule The opentelemetry.instrumentation namespace will be used by several packages as they become compliant to the opentelemetry specification. As a result, top-level instrumentations who have a name identical to their instrumented library (e.g. opentelemetry.instrumentation.requests or opentelemetry.instrumentation.starlette) will have a cyclic import error due to opentelemetry-instrument's injection of the opentelemetry.instrument folder in the path. Moving auto-instrumentation to a submodule solves this problem, as the only files in the opentelemetry.instrumentation.auto_instrument folder is the sitecustomize and the __init__.py itself. --- .../{auto_instrumentation.py => auto_instrumentation/__init__.py} | 0 .../instrumentation/{ => auto_instrumentation}/sitecustomize.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename opentelemetry-instrumentation/src/opentelemetry/instrumentation/{auto_instrumentation.py => auto_instrumentation/__init__.py} (100%) rename opentelemetry-instrumentation/src/opentelemetry/instrumentation/{ => auto_instrumentation}/sitecustomize.py (100%) diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py similarity index 100% rename from opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation.py rename to opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/sitecustomize.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py similarity index 100% rename from opentelemetry-instrumentation/src/opentelemetry/instrumentation/sitecustomize.py rename to opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py