Skip to content

Commit 97fa836

Browse files
committed
Respond to comments
1 parent 813c11c commit 97fa836

File tree

3 files changed

+18
-10
lines changed
  • exporter
    • opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc
    • opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_common
  • opentelemetry-sdk/src/opentelemetry/sdk/environment_variables

3 files changed

+18
-10
lines changed

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,27 +178,27 @@ def _get_credentials(
178178
) -> ChannelCredentials:
179179
if creds is not None:
180180
return creds
181-
credential_env = environ.get(credential_entry_point_env_key)
182-
if credential_env:
181+
_credential_env = environ.get(credential_entry_point_env_key)
182+
if _credential_env:
183183
try:
184184
maybe_channel_creds = next(
185185
iter(
186186
entry_points(
187187
group="opentelemetry_otlp_credential_provider",
188-
name=credential_env,
188+
name=_credential_env,
189189
)
190190
)
191191
).load()()
192192
except StopIteration:
193193
raise RuntimeError(
194-
f"Requested component '{credential_env}' not found in "
194+
f"Requested component '{_credential_env}' not found in "
195195
f"entry point 'opentelemetry_otlp_credential_provider'"
196196
)
197197
if isinstance(maybe_channel_creds, ChannelCredentials):
198198
return maybe_channel_creds
199199
else:
200200
raise RuntimeError(
201-
f"Requested component '{credential_env}' is of type {type(maybe_channel_creds)}"
201+
f"Requested component '{_credential_env}' is of type {type(maybe_channel_creds)}"
202202
f" must be of type `grpc.ChannelCredentials`."
203203
)
204204

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_common/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,29 @@ def _load_session_from_envvar(
4141
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
4242
],
4343
) -> Optional[requests.Session]:
44-
credential_env = environ.get(
44+
_credential_env = environ.get(
4545
OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER
4646
) or environ.get(cred_envvar)
47-
if credential_env:
47+
if _credential_env:
4848
try:
4949
maybe_session = next(
5050
iter(
5151
entry_points(
5252
group="opentelemetry_otlp_credential_provider",
53-
name=credential_env,
53+
name=_credential_env,
5454
)
5555
)
5656
).load()()
5757
except StopIteration:
5858
raise RuntimeError(
59-
f"Requested component '{credential_env}' not found in "
59+
f"Requested component '{_credential_env}' not found in "
6060
f"entry point 'opentelemetry_otlp_credential_provider'"
6161
)
6262
if isinstance(maybe_session, requests.Session):
6363
return maybe_session
6464
else:
6565
raise RuntimeError(
66-
f"Requested component '{credential_env}' is of type {type(maybe_session)}"
66+
f"Requested component '{_credential_env}' is of type {type(maybe_session)}"
6767
f" must be of type `requests.Session`."
6868
)
6969
return None

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@
410410
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
411411
def channel_credential_provider() -> grpc.ChannelCredentials:
412412
413+
Note: This environment variable is experimental and subject to change.
413414
"""
414415

415416
OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER = (
@@ -428,6 +429,7 @@ def channel_credential_provider() -> grpc.ChannelCredentials:
428429
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
429430
def request_session_provder() -> requests.Session:
430431
432+
Note: This environment variable is experimental and subject to change.
431433
"""
432434
OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER = (
433435
"OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER"
@@ -445,6 +447,7 @@ def request_session_provder() -> requests.Session:
445447
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
446448
def request_session_provder() -> requests.Session:
447449
450+
Note: This environment variable is experimental and subject to change.
448451
"""
449452
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER = (
450453
"OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER"
@@ -462,6 +465,7 @@ def request_session_provder() -> requests.Session:
462465
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
463466
def channel_credential_provider() -> grpc.ChannelCredentials:
464467
468+
Note: This environment variable is experimental and subject to change.
465469
"""
466470
OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER = (
467471
"OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER"
@@ -479,6 +483,7 @@ def channel_credential_provider() -> grpc.ChannelCredentials:
479483
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
480484
def request_session_provder() -> requests.Session:
481485
486+
Note: This environment variable is experimental and subject to change.
482487
"""
483488
OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER = (
484489
"OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER"
@@ -496,6 +501,7 @@ def request_session_provder() -> requests.Session:
496501
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
497502
def channel_credential_provider() -> grpc.ChannelCredentials:
498503
504+
Note: This environment variable is experimental and subject to change.
499505
"""
500506
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER = (
501507
"OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER"
@@ -513,6 +519,7 @@ def channel_credential_provider() -> grpc.ChannelCredentials:
513519
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
514520
def request_session_provder() -> requests.Session:
515521
522+
Note: This environment variable is experimental and subject to change.
516523
"""
517524
OTEL_PYTHON_EXPORTER_OTLP_GRPC_METRICS_CREDENTIAL_PROVIDER = (
518525
"OTEL_PYTHON_EXPORTER_OTLP_GRPC_METRICS_CREDENTIAL_PROVIDER"
@@ -530,6 +537,7 @@ def request_session_provder() -> requests.Session:
530537
# Add a reference to this function under the `opentelemetry_otlp_credential_provider` entry point.
531538
def channel_credential_provider() -> grpc.ChannelCredentials:
532539
540+
Note: This environment variable is experimental and subject to change.
533541
"""
534542

535543
OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE = "OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE"

0 commit comments

Comments
 (0)