Skip to content

Commit 6aa7ed3

Browse files
committed
Add customizer to contrib.
1 parent 14ca76c commit 6aa7ed3

File tree

5 files changed

+25
-2
lines changed

5 files changed

+25
-2
lines changed

opentelemetry-distro/pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ otlp = [
4040
[project.entry-points.opentelemetry_configurator]
4141
configurator = "opentelemetry.distro:OpenTelemetryConfigurator"
4242

43+
[project.entry-points.opentelemetry_customizer]
44+
customizer = "opentelemetry.distro:OpenTelemetryCustomizer"
45+
4346
[project.entry-points.opentelemetry_distro]
4447
distro = "opentelemetry.distro:OpenTelemetryDistro"
4548

opentelemetry-distro/src/opentelemetry/distro/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
)
2222
from opentelemetry.instrumentation.distro import BaseDistro
2323
from opentelemetry.sdk._configuration import _OTelSDKConfigurator
24+
from opentelemetry.sdk._config_customizer import _BaseConfiguratorCustomizer
2425
from opentelemetry.sdk.environment_variables import OTEL_EXPORTER_OTLP_PROTOCOL
2526

2627

2728
class OpenTelemetryConfigurator(_OTelSDKConfigurator):
2829
pass
2930

31+
class OpenTelemetryCustomizer(_BaseConfiguratorCustomizer):
32+
pass
3033

3134
class OpenTelemetryDistro(BaseDistro):
3235
"""

opentelemetry-instrumentation/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.4",
30-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-semantic-conventions == 0.51b0",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
"packaging >= 18.0",
3333
]

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from opentelemetry.instrumentation.distro import BaseDistro, DefaultDistro
2323
from opentelemetry.instrumentation.environment_variables import (
2424
OTEL_PYTHON_CONFIGURATOR,
25+
OTEL_PYTHON_CUSTOMIZER,
2526
OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
2627
OTEL_PYTHON_DISTRO,
2728
)
@@ -133,6 +134,17 @@ def _load_instrumentors(distro):
133134

134135

135136
def _load_configurators():
137+
print("attempting to load customizer")
138+
customizer = None
139+
if environ.get(OTEL_PYTHON_CUSTOMIZER, None):
140+
print("got env var..")
141+
for entry_point in entry_points(
142+
group="opentelemetry_customizer",
143+
name=environ.get(OTEL_PYTHON_CUSTOMIZER, None),
144+
):
145+
print("loading customizer")
146+
customizer = entry_point.load()()
147+
break
136148
configurator_name = environ.get(OTEL_PYTHON_CONFIGURATOR, None)
137149
configured = None
138150
for entry_point in entry_points(group="opentelemetry_configurator"):
@@ -149,7 +161,8 @@ def _load_configurators():
149161
or configurator_name == entry_point.name
150162
):
151163
entry_point.load()().configure(
152-
auto_instrumentation_version=__version__
164+
auto_instrumentation_version=__version__,
165+
customizer=customizer,
153166
) # type: ignore
154167
configured = entry_point.name
155168
else:

opentelemetry-instrumentation/src/opentelemetry/instrumentation/environment_variables.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@
2626
"""
2727
.. envvar:: OTEL_PYTHON_CONFIGURATOR
2828
"""
29+
OTEL_PYTHON_CUSTOMIZER = "OTEL_PYTHON_CUSTOMIZER"
30+
"""
31+
.. envvar:: OTEL_PYTHON_CUSTOMIZER
32+
"""

0 commit comments

Comments
 (0)