Respond to comments

Author: DylanRussell

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

@@ -35,17 +35,15 @@ def _is_retryable(resp: requests.Response) -> bool:
 
 
 def _load_session_from_envvar(
-    exporter_type: Literal["logs", "traces", "metrics"],
+    cred_envvar: Literal[
+        OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
+        OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
+        OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER,
+    ],
 ) -> Optional[requests.Session]:
-    if exporter_type == "logs":
-        env_var = OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER
-    elif exporter_type == "traces":
-        env_var = OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER
-    else:
-        env_var = OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER
     credential_env = environ.get(
         OTEL_PYTHON_EXPORTER_OTLP_CREDENTIAL_PROVIDER
-    ) or environ.get(env_var)
+    ) or environ.get(cred_envvar)
     if credential_env:
         try:
             maybe_session = next(
@@ -64,13 +62,3 @@ def _load_session_from_envvar(
         if isinstance(maybe_session, requests.Session):
             return maybe_session
     return None
-
-
-# For testing
-class IterEntryPoint:
-    def __init__(self, name, class_type):
-        self.name = name
-        self.class_type = class_type
-
-    def load(self):
-        return self.class_type

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

@@ -48,6 +48,7 @@
     OTEL_EXPORTER_OTLP_ENDPOINT,
     OTEL_EXPORTER_OTLP_HEADERS,
     OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
+    OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER,
     OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,
     OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY,
     OTEL_EXPORTER_OTLP_LOGS_COMPRESSION,
@@ -122,7 +123,7 @@ def __init__(
         )
         self._compression = compression or _compression_from_env()
         self._session = (
-            session or _load_session_from_envvar("logs") or requests.Session()
+            session or _load_session_from_envvar(OTEL_PYTHON_EXPORTER_OTLP_LOGS_CREDENTIAL_PROVIDER) or requests.Session()
         )
         self._session.headers.update(self._headers)
         self._session.headers.update(_OTLP_HTTP_HEADERS)

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

@@ -77,6 +77,7 @@
     OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE,
     OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY,
     OTEL_EXPORTER_OTLP_METRICS_COMPRESSION,
+    OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER
     OTEL_EXPORTER_OTLP_METRICS_ENDPOINT,
     OTEL_EXPORTER_OTLP_METRICS_HEADERS,
     OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
@@ -162,7 +163,7 @@ def __init__(
         self._compression = compression or _compression_from_env()
         self._session = (
             session
-            or _load_session_from_envvar("metrics")
+            or _load_session_from_envvar(OTEL_PYTHON_EXPORTER_OTLP_METRICS_CREDENTIAL_PROVIDER)
             or requests.Session()
         )
         self._session.headers.update(self._headers)

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

@@ -51,6 +51,7 @@
     OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
     OTEL_EXPORTER_OTLP_TRACES_HEADERS,
     OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
+    OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER,
 )
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
@@ -118,7 +119,9 @@ def __init__(
         self._compression = compression or _compression_from_env()
         self._session = (
             session
-            or _load_session_from_envvar("traces")
+            or _load_session_from_envvar(
+                OTEL_PYTHON_EXPORTER_OTLP_TRACES_CREDENTIAL_PROVIDER
+            )
             or requests.Session()
         )
         self._session.headers.update(self._headers)

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

@@ -0,0 +1,23 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# pylint: disable=protected-access
+
+class IterEntryPoint:
+    def __init__(self, name, class_type):
+        self.name = name
+        self.class_type = class_type
+
+    def load(self):
+        return self.class_type

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

@@ -26,7 +26,6 @@
     encode_metrics,
 )
 from opentelemetry.exporter.otlp.proto.http import Compression
-from opentelemetry.exporter.otlp.proto.http._common import IterEntryPoint
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import (
     DEFAULT_COMPRESSION,
     DEFAULT_ENDPOINT,
@@ -79,6 +78,8 @@
 )
 from opentelemetry.test.metrictestutil import _generate_sum
 
+from .._common import IterEntryPoint
+
 OS_ENV_ENDPOINT = "os.env.base"
 OS_ENV_CERTIFICATE = "os/env/base.crt"
 OS_ENV_CLIENT_CERTIFICATE = "os/env/client-cert.pem"

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

@@ -28,7 +28,6 @@
 
 from opentelemetry._logs import SeverityNumber
 from opentelemetry.exporter.otlp.proto.http import Compression
-from opentelemetry.exporter.otlp.proto.http._common import IterEntryPoint
 from opentelemetry.exporter.otlp.proto.http._log_exporter import (
     DEFAULT_COMPRESSION,
     DEFAULT_ENDPOINT,
@@ -69,6 +68,8 @@
     set_span_in_context,
 )
 
+from ._common import IterEntryPoint
+
 ENV_ENDPOINT = "http://localhost.env:8080/"
 ENV_CERTIFICATE = "/etc/base.crt"
 ENV_CLIENT_CERTIFICATE = "/etc/client-cert.pem"

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_span_exporter.py

@@ -23,7 +23,6 @@
 from requests.models import Response
 
 from opentelemetry.exporter.otlp.proto.http import Compression
-from opentelemetry.exporter.otlp.proto.http._common import IterEntryPoint
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     DEFAULT_COMPRESSION,
     DEFAULT_ENDPOINT,
@@ -52,6 +51,8 @@
 from opentelemetry.sdk.trace import _Span
 from opentelemetry.sdk.trace.export import SpanExportResult
 
+from ._common import IterEntryPoint
+
 OS_ENV_ENDPOINT = "os.env.base"
 OS_ENV_CERTIFICATE = "os/env/base.crt"
 OS_ENV_CLIENT_CERTIFICATE = "os/env/client-cert.pem"

tox.ini

@@ -346,7 +346,6 @@ deps =
   -e {toxinidir}/opentelemetry-sdk
   -e {toxinidir}/tests/opentelemetry-test-utils
 commands =
-  pip freeze
   pyright --version
   pyright