From 08d1ab7872ae0511a866df0b1bdf9e986505bb27 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Wed, 27 Oct 2021 16:16:21 -0700 Subject: [PATCH 1/2] version --- CHANGELOG.md | 2 ++ .../instrumentation/auto_instrumentation/sitecustomize.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index feb5441eff..848532162e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#739](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/739)) - Add support for Python 3.10 ([#742](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/742)) +- Pass in auto-instrumentation version to configurator + ([#742](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/742)) ### Fixed diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py index f7a6412ff6..4971ad146c 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py @@ -27,6 +27,7 @@ from opentelemetry.instrumentation.environment_variables import ( OTEL_PYTHON_DISABLED_INSTRUMENTATIONS, ) +from opentelemetry.instrumentation.version import __version__ logger = getLogger(__file__) @@ -102,7 +103,7 @@ def _load_configurators(): ) continue try: - entry_point.load()().configure() # type: ignore + entry_point.load()().configure(auto_instrumentation_version=__version__) # type: ignore configured = entry_point.name except Exception as exc: # pylint: disable=broad-except logger.exception("Configuration of %s failed", entry_point.name) From fb672fc342b7617b89723060c28359a0e3d1e2cb Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Wed, 27 Oct 2021 16:25:04 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0234cb9099..138611a484 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add support for Python 3.10 ([#742](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/742)) - Pass in auto-instrumentation version to configurator - ([#742](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/742)) + ([#783](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/783)) - `opentelemetry-instrumentation` Add `setuptools` to `install_requires` ([#781](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/781))