Merge branch 'distro-specification' of https://github.com/jeremydvoss…

…/opentelemetry-python-contrib into distro-specification
open-telemetry · Jun 1, 2023 · 5ecfb85 · 5ecfb85
2 parents ada4ab7 + d8e4ac4
commit 5ecfb85
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -95,12 +95,13 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
 - [Aaron Abbott](https://github.com/aabmass), Google
+- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Sanket Mehta](https://github.com/sanketmehta28), Cisco
 - [Shalev Roda](https://github.com/shalevr), Cisco
 
 Emeritus Approvers:
 
-- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
+- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
 - [Ashutosh Goel](https://github.com/ashu658), Cisco
@@ -111,12 +112,12 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
 
 - [Diego Hurtado](https://github.com/ocelotl), Lightstep
 - [Leighton Chen](https://github.com/lzchen), Microsoft
-- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
 
 Emeritus Maintainers:
 
 - [Alex Boten](https://github.com/codeboten), Lightstep
 - [Owais Lone](https://github.com/owais), Splunk
+- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
 

diff --git a/...telemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py b/...telemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py
@@ -95,23 +95,22 @@ def _load_instrumentors(distro):
 
 def _load_configurators():
     configurator_name = environ.get(OTEL_PYTHON_CONFIGURATOR, None)
-    # configured = None
+    configured = None
     for entry_point in iter_entry_points("opentelemetry_configurator"):
-        # if configured is not None:
-        #     logger.warning(
-        #         "Configuration of %s not loaded, %s already loaded",
-        #         entry_point.name,
-        #         configured,
-        #     )
-        #     continue
+        if configured is not None:
+            logger.warning(
+                "Configuration of %s not loaded, %s already loaded",
+                entry_point.name,
+                configured,
+            )
+            continue
         try:
             if (
                 configurator_name is None
                 or configurator_name == entry_point.name
             ):
                 entry_point.load()().configure(auto_instrumentation_version=__version__)  # type: ignore
-                # configured = entry_point.name
-                return
+                configured = entry_point.name
             else:
                 logger.warning(
                     "Configuration of %s not loaded because %s is set by %s",

diff --git a/...y-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py b/...y-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py
@@ -27,7 +27,6 @@
 
 
 def initialize():
-    print("JEREVOSS SITE")
     # prevents auto-instrumentation of subprocesses if code execs another python process
     environ["PYTHONPATH"] = _python_path_without_directory(
         environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep