Skip to content

Commit 813c11c

Browse files
committed
Add http/grpc env var variants
1 parent 24119fb commit 813c11c

File tree

13 files changed

+134
-63
lines changed

13 files changed

+134
-63
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
OTEL_EXPORTER_OTLP_LOGS_HEADERS,
4141
OTEL_EXPORTER_OTLP_LOGS_INSECURE,
4242
OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
43-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
43+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_LOGS_CREDENTIAL_PROVIDER,
4444
)
4545

4646

@@ -74,7 +74,7 @@ def __init__(
7474
):
7575
credentials = _get_credentials(
7676
credentials,
77-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
77+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_LOGS_CREDENTIAL_PROVIDER,
7878
OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
7979
OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY,
8080
OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
OTEL_EXPORTER_OTLP_HEADERS,
7070
OTEL_EXPORTER_OTLP_INSECURE,
7171
OTEL_EXPORTER_OTLP_TIMEOUT,
72-
OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER,
72+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER,
7373
)
7474
from opentelemetry.sdk.metrics.export import MetricsData
7575
from opentelemetry.sdk.resources import Resource as SDKResource
@@ -306,7 +306,7 @@ def __init__(
306306
else:
307307
self._credentials = _get_credentials(
308308
credentials,
309-
OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER,
309+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER,
310310
OTEL_EXPORTER_OTLP_CERTIFICATE,
311311
OTEL_EXPORTER_OTLP_CLIENT_KEY,
312312
OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
OTEL_EXPORTER_OTLP_METRICS_HEADERS,
5252
OTEL_EXPORTER_OTLP_METRICS_INSECURE,
5353
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
54-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
54+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_METRICS_CREDENTIAL_PROVIDER,
5555
)
5656
from opentelemetry.sdk.metrics._internal.aggregation import Aggregation
5757
from opentelemetry.sdk.metrics.export import ( # noqa: F401
@@ -119,7 +119,7 @@ def __init__(
119119
):
120120
credentials = _get_credentials(
121121
credentials,
122-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
122+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_METRICS_CREDENTIAL_PROVIDER,
123123
OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE,
124124
OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY,
125125
OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
OTEL_EXPORTER_OTLP_TRACES_HEADERS,
5555
OTEL_EXPORTER_OTLP_TRACES_INSECURE,
5656
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
57-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
57+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER,
5858
)
5959
from opentelemetry.sdk.trace import ReadableSpan
6060
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
@@ -107,7 +107,7 @@ def __init__(
107107
):
108108
credentials = _get_credentials(
109109
credentials,
110-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
110+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER,
111111
OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE,
112112
OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY,
113113
OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE,

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_exporter_mixin.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
)
5151
from opentelemetry.sdk.environment_variables import (
5252
OTEL_EXPORTER_OTLP_COMPRESSION,
53-
OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER,
53+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER,
5454
)
5555
from opentelemetry.sdk.trace import ReadableSpan, _Span
5656
from opentelemetry.sdk.trace.export import (
@@ -288,7 +288,9 @@ def test_otlp_exporter_otlp_compression_unspecified(
288288

289289
@patch.dict(
290290
"os.environ",
291-
{OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER: "credential_provider"},
291+
{
292+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER: "credential_provider"
293+
},
292294
)
293295
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.entry_points")
294296
def test_that_credential_gets_passed_to_exporter(self, mock_entry_points):
@@ -306,18 +308,24 @@ def f():
306308

307309
@patch.dict(
308310
"os.environ",
309-
{OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER: "credential_provider"},
311+
{
312+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER: "credential_provider"
313+
},
310314
)
311315
def test_that_missing_entry_point_raises_exception(self):
312316
with self.assertRaises(RuntimeError):
313317
OTLPSpanExporterForTesting(insecure=False)
314318

315319
@patch.dict(
316320
"os.environ",
317-
{OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER: "credential_provider"},
321+
{
322+
OTEL_PYTHON_EXPORTER_OTLP_GRPC_CREDENTIAL_PROVIDER: "credential_provider"
323+
},
318324
)
319325
@patch("opentelemetry.exporter.otlp.proto.grpc.exporter.entry_points")
320-
def test_that_entry_point_returning_bad_type_raises_exception(self, mock_entry_points):
326+
def test_that_entry_point_returning_bad_type_raises_exception(
327+
self, mock_entry_points
328+
):
321329
def f():
322330
return 1
323331

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import requests
1919

2020
from opentelemetry.sdk.environment_variables import (
21-
OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER,
22-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
23-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
24-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
21+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER,
22+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
23+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
24+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
2525
)
2626
from opentelemetry.util._importlib_metadata import entry_points
2727

@@ -36,13 +36,13 @@ def _is_retryable(resp: requests.Response) -> bool:
3636

3737
def _load_session_from_envvar(
3838
cred_envvar: Literal[
39-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
40-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
41-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
39+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
40+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
41+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
4242
],
4343
) -> Optional[requests.Session]:
4444
credential_env = environ.get(
45-
OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER
45+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER
4646
) or environ.get(cred_envvar)
4747
if credential_env:
4848
try:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
OTEL_EXPORTER_OTLP_LOGS_HEADERS,
5656
OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
5757
OTEL_EXPORTER_OTLP_TIMEOUT,
58-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
58+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
5959
)
6060
from opentelemetry.util.re import parse_env_headers
6161

@@ -125,7 +125,7 @@ def __init__(
125125
self._session = (
126126
session
127127
or _load_session_from_envvar(
128-
OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER
128+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER
129129
)
130130
or requests.Session()
131131
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
OTEL_EXPORTER_OTLP_METRICS_HEADERS,
8282
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
8383
OTEL_EXPORTER_OTLP_TIMEOUT,
84-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
84+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
8585
)
8686
from opentelemetry.sdk.metrics._internal.aggregation import Aggregation
8787
from opentelemetry.sdk.metrics.export import ( # noqa: F401
@@ -164,7 +164,7 @@ def __init__(
164164
self._session = (
165165
session
166166
or _load_session_from_envvar(
167-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER
167+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER
168168
)
169169
or requests.Session()
170170
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
5252
OTEL_EXPORTER_OTLP_TRACES_HEADERS,
5353
OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
54-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
54+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
5555
)
5656
from opentelemetry.sdk.trace import ReadableSpan
5757
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
@@ -120,7 +120,7 @@ def __init__(
120120
self._session = (
121121
session
122122
or _load_session_from_envvar(
123-
OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER
123+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER
124124
)
125125
or requests.Session()
126126
)

exporter/opentelemetry-exporter-otlp-proto-http/tests/metrics/test_otlp_metrics_exporter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE,
5252
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
5353
OTEL_EXPORTER_OTLP_TIMEOUT,
54-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
54+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
5555
)
5656
from opentelemetry.sdk.metrics import (
5757
Counter,
@@ -156,7 +156,7 @@ def test_constructor_default(self):
156156
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "https://metrics.endpoint.env",
157157
OTEL_EXPORTER_OTLP_METRICS_HEADERS: "metricsEnv1=val1,metricsEnv2=val2,metricEnv3===val3==,User-agent=metrics-user-agent",
158158
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT: "40",
159-
OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER: "credential_provider",
159+
OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER: "credential_provider",
160160
},
161161
)
162162
@patch("opentelemetry.exporter.otlp.proto.http._common.entry_points")

0 commit comments

Comments
 (0)