Skip to content

Commit 5ecfb85

Browse files
committed
Merge branch 'distro-specification' of https://github.com/jeremydvoss/opentelemetry-python-contrib into distro-specification
2 parents ada4ab7 + d8e4ac4 commit 5ecfb85

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,13 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
9595
Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
9696

9797
- [Aaron Abbott](https://github.com/aabmass), Google
98+
- [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
9899
- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
99100
- [Shalev Roda](https://github.com/shalevr), Cisco
100101

101102
Emeritus Approvers:
102103

103-
- [Hector Hernandez](https://github.com/hectorhdzg), Microsoft
104+
- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
104105
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
105106
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
106107
- [Ashutosh Goel](https://github.com/ashu658), Cisco
@@ -111,12 +112,12 @@ Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-t
111112

112113
- [Diego Hurtado](https://github.com/ocelotl), Lightstep
113114
- [Leighton Chen](https://github.com/lzchen), Microsoft
114-
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
115115

116116
Emeritus Maintainers:
117117

118118
- [Alex Boten](https://github.com/codeboten), Lightstep
119119
- [Owais Lone](https://github.com/owais), Splunk
120+
- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
120121

121122
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
122123

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,22 @@ def _load_instrumentors(distro):
9595

9696
def _load_configurators():
9797
configurator_name = environ.get(OTEL_PYTHON_CONFIGURATOR, None)
98-
# configured = None
98+
configured = None
9999
for entry_point in iter_entry_points("opentelemetry_configurator"):
100-
# if configured is not None:
101-
# logger.warning(
102-
# "Configuration of %s not loaded, %s already loaded",
103-
# entry_point.name,
104-
# configured,
105-
# )
106-
# continue
100+
if configured is not None:
101+
logger.warning(
102+
"Configuration of %s not loaded, %s already loaded",
103+
entry_point.name,
104+
configured,
105+
)
106+
continue
107107
try:
108108
if (
109109
configurator_name is None
110110
or configurator_name == entry_point.name
111111
):
112112
entry_point.load()().configure(auto_instrumentation_version=__version__) # type: ignore
113-
# configured = entry_point.name
114-
return
113+
configured = entry_point.name
115114
else:
116115
logger.warning(
117116
"Configuration of %s not loaded because %s is set by %s",

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828

2929
def initialize():
30-
print("JEREVOSS SITE")
3130
# prevents auto-instrumentation of subprocesses if code execs another python process
3231
environ["PYTHONPATH"] = _python_path_without_directory(
3332
environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep

0 commit comments

Comments
 (0)