Merge branch 'main' into codeboten/fix-close-response

Author: codeboten

.github/workflows/fossa.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+      - uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
         with:
           api-key: ${{secrets.FOSSA_API_KEY}}
           team: OpenTelemetry

CHANGELOG.md

@@ -7,14 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix user agent in OTLP HTTP metrics exporter
+  ([#4475](https://github.com/open-telemetry/opentelemetry-python/pull/4475))
+- Improve performance of baggage operations
+  ([#4466](https://github.com/open-telemetry/opentelemetry-python/pull/4466))
+- sdk: remove duplicated constant definitions for `environment_variables`
+  ([#4491](https://github.com/open-telemetry/opentelemetry-python/pull/4491))
+- api: Revert record `BaseException` change in `trace_api.use_span()`
+  ([#4494](https://github.com/open-telemetry/opentelemetry-python/pull/4494))
+
 ## Version 1.31.0/0.52b0 (2025-03-12)
 
 - semantic-conventions: Bump to 1.31.0
   ([#4471](https://github.com/open-telemetry/opentelemetry-python/pull/4471))
 - Add type annotations to context's attach & detach
   ([#4346](https://github.com/open-telemetry/opentelemetry-python/pull/4346))
 - Fix OTLP encoders missing instrumentation scope schema url and attributes
-  ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))  
+  ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))
 - prometheus-exporter: fix labels out of place for data points with different
   attribute sets
   ([#4413](https://github.com/open-telemetry/opentelemetry-python/pull/4413))

docs/examples/fork-process-model/flask-uwsgi/requirements.txt

@@ -2,9 +2,8 @@ click==8.1.7
 Flask==2.3.3
 googleapis-common-protos==1.52.0
 grpcio==1.56.2
-gunicorn==22.0.0
 itsdangerous==2.1.2
-Jinja2==3.1.5
+Jinja2==3.1.6
 MarkupSafe==2.1.3
 opentelemetry-api==1.20.0
 opentelemetry-exporter-otlp==1.20.0

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

@@ -40,7 +40,10 @@
 from opentelemetry.exporter.otlp.proto.common.metrics_encoder import (
     encode_metrics,
 )
-from opentelemetry.exporter.otlp.proto.http import Compression
+from opentelemetry.exporter.otlp.proto.http import (
+    _OTLP_HTTP_HEADERS,
+    Compression,
+)
 from opentelemetry.proto.collector.metrics.v1.metrics_service_pb2 import (  # noqa: F401
     ExportMetricsServiceRequest,
 )
@@ -152,9 +155,7 @@ def __init__(
         self._compression = compression or _compression_from_env()
         self._session = session or requests.Session()
         self._session.headers.update(self._headers)
-        self._session.headers.update(
-            {"Content-Type": "application/x-protobuf"}
-        )
+        self._session.headers.update(_OTLP_HTTP_HEADERS)
         if self._compression is not Compression.NoCompression:
             self._session.headers.update(
                 {"Content-Encoding": self._compression.value}

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

@@ -32,6 +32,7 @@
     DEFAULT_TIMEOUT,
     OTLPMetricExporter,
 )
+from opentelemetry.exporter.otlp.proto.http.version import __version__
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_CERTIFICATE,
     OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE,
@@ -124,6 +125,15 @@ def test_constructor_default(self):
         self.assertIs(exporter._compression, DEFAULT_COMPRESSION)
         self.assertEqual(exporter._headers, {})
         self.assertIsInstance(exporter._session, Session)
+        self.assertIn("User-Agent", exporter._session.headers)
+        self.assertEqual(
+            exporter._session.headers.get("Content-Type"),
+            "application/x-protobuf",
+        )
+        self.assertEqual(
+            exporter._session.headers.get("User-Agent"),
+            "OTel-OTLP-Exporter-Python/" + __version__,
+        )
 
     @patch.dict(
         "os.environ",

opentelemetry-api/src/opentelemetry/baggage/__init__.py

@@ -15,7 +15,7 @@
 from logging import getLogger
 from re import compile
 from types import MappingProxyType
-from typing import Mapping, Optional
+from typing import Dict, Mapping, Optional
 
 from opentelemetry.context import create_key, get_value, set_value
 from opentelemetry.context.context import Context
@@ -44,10 +44,7 @@ def get_all(
     Returns:
         The name/value pairs in the Baggage
     """
-    baggage = get_value(_BAGGAGE_KEY, context=context)
-    if isinstance(baggage, dict):
-        return MappingProxyType(baggage)
-    return MappingProxyType({})
+    return MappingProxyType(_get_baggage_value(context=context))
 
 
 def get_baggage(
@@ -64,7 +61,7 @@ def get_baggage(
         The value associated with the given name, or null if the given name is
         not present.
     """
-    return get_all(context=context).get(name)
+    return _get_baggage_value(context=context).get(name)
 
 
 def set_baggage(
@@ -80,7 +77,7 @@ def set_baggage(
     Returns:
         A Context with the value updated
     """
-    baggage = dict(get_all(context=context))
+    baggage = _get_baggage_value(context=context).copy()
     baggage[name] = value
     return set_value(_BAGGAGE_KEY, baggage, context=context)
 
@@ -95,7 +92,7 @@ def remove_baggage(name: str, context: Optional[Context] = None) -> Context:
     Returns:
         A Context with the name/value removed
     """
-    baggage = dict(get_all(context=context))
+    baggage = _get_baggage_value(context=context).copy()
     baggage.pop(name, None)
 
     return set_value(_BAGGAGE_KEY, baggage, context=context)
@@ -113,6 +110,13 @@ def clear(context: Optional[Context] = None) -> Context:
     return set_value(_BAGGAGE_KEY, {}, context=context)
 
 
+def _get_baggage_value(context: Optional[Context] = None) -> Dict[str, object]:
+    baggage = get_value(_BAGGAGE_KEY, context=context)
+    if isinstance(baggage, dict):
+        return baggage
+    return {}
+
+
 def _is_valid_key(name: str) -> bool:
     return _KEY_PATTERN.fullmatch(str(name)) is not None
 

opentelemetry-api/src/opentelemetry/trace/__init__.py

@@ -588,7 +588,10 @@ def use_span(
         finally:
             context_api.detach(token)
 
-    except BaseException as exc:  # pylint: disable=broad-exception-caught
+    # Record only exceptions that inherit Exception class but not BaseException, because
+    # classes that directly inherit BaseException are not technically errors, e.g. GeneratorExit.
+    # See https://github.com/open-telemetry/opentelemetry-python/issues/4484
+    except Exception as exc:  # pylint: disable=broad-exception-caught
         if isinstance(span, Span) and span.is_recording():
             # Record the exception as an event
             if record_exception:

opentelemetry-api/tests/trace/test_globals.py

@@ -1,3 +1,17 @@
+# 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.
+
 import unittest
 from unittest.mock import Mock, patch
 
@@ -13,7 +27,12 @@ class SpanTest(trace.NonRecordingSpan):
     recorded_status = Status(status_code=StatusCode.UNSET)
 
     def set_status(self, status, description=None):
-        self.recorded_status = status
+        if isinstance(status, Status):
+            self.recorded_status = status
+        else:
+            self.recorded_status = Status(
+                status_code=status, description=description
+            )
 
     def end(self, end_time=None):
         self.has_ended = True
@@ -133,18 +152,6 @@ class TestUseSpanException(Exception):
 
         self.assertEqual(test_span.recorded_exception, exception)
 
-    def test_use_span_base_exception(self):
-        class TestUseSpanBaseException(BaseException):
-            pass
-
-        test_span = SpanTest(trace.INVALID_SPAN_CONTEXT)
-        exception = TestUseSpanBaseException("test exception")
-        with self.assertRaises(TestUseSpanBaseException):
-            with trace.use_span(test_span):
-                raise exception
-
-        self.assertEqual(test_span.recorded_exception, exception)
-
     def test_use_span_set_status(self):
         class TestUseSpanException(Exception):
             pass
@@ -155,10 +162,33 @@ class TestUseSpanException(Exception):
                 raise TestUseSpanException("test error")
 
         self.assertEqual(
-            test_span.recorded_status.status_code,  # type: ignore[reportAttributeAccessIssue]
+            test_span.recorded_status.status_code,
             StatusCode.ERROR,
         )
         self.assertEqual(
-            test_span.recorded_status.description,  # type: ignore[reportAttributeAccessIssue]
+            test_span.recorded_status.description,
             "TestUseSpanException: test error",
         )
+
+    def test_use_span_base_exceptions(self):
+        base_exception_classes = [
+            BaseException,
+            GeneratorExit,
+            SystemExit,
+            KeyboardInterrupt,
+        ]
+
+        for exc_cls in base_exception_classes:
+            with self.subTest(exc=exc_cls.__name__):
+                test_span = SpanTest(trace.INVALID_SPAN_CONTEXT)
+
+                with self.assertRaises(exc_cls):
+                    with trace.use_span(test_span):
+                        raise exc_cls()
+
+                self.assertEqual(
+                    test_span.recorded_status.status_code,
+                    StatusCode.UNSET,
+                )
+                self.assertIsNone(test_span.recorded_status.description)
+                self.assertIsNone(test_span.recorded_exception)

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

@@ -565,25 +565,6 @@
 Default: False
 """
 
-OTEL_EXPORTER_OTLP_METRICS_ENDPOINT = "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_ENDPOINT` target to which the metric exporter is going to send spans.
-The endpoint MUST be a valid URL host, and MAY contain a scheme (http or https), port and path.
-A scheme of https indicates a secure connection and takes precedence over this configuration setting.
-"""
-
-OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE = (
-    "OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE"
-)
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE` stores the path to the certificate file for
-TLS credentials of gRPC client for metrics. Should only be used for a secure connection for metrics.
-"""
-
 OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE = "OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE"
 """
 .. envvar:: OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE
@@ -592,22 +573,6 @@
 TLS credentials of gRPC client for logs. Should only be used for a secure connection for logs.
 """
 
-OTEL_EXPORTER_OTLP_METRICS_HEADERS = "OTEL_EXPORTER_OTLP_METRICS_HEADERS"
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_HEADERS
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_HEADERS` contains the key-value pairs to be used as headers for metrics
-associated with gRPC or HTTP requests.
-"""
-
-OTEL_EXPORTER_OTLP_METRICS_TIMEOUT = "OTEL_EXPORTER_OTLP_METRICS_TIMEOUT"
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_TIMEOUT
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` is the maximum time the OTLP exporter will
-wait for each batch export for metrics.
-"""
-
 OTEL_EXPORTER_OTLP_LOGS_TIMEOUT = "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT"
 """
 .. envvar:: OTEL_EXPORTER_OTLP_LOGS_TIMEOUT
@@ -616,16 +581,6 @@
 wait for each batch export for logs.
 """
 
-OTEL_EXPORTER_OTLP_METRICS_COMPRESSION = (
-    "OTEL_EXPORTER_OTLP_METRICS_COMPRESSION"
-)
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_COMPRESSION
-
-Same as :envvar:`OTEL_EXPORTER_OTLP_COMPRESSION` but only for the metric
-exporter. If both are present, this takes higher precedence.
-"""
-
 OTEL_EXPORTER_JAEGER_CERTIFICATE = "OTEL_EXPORTER_JAEGER_CERTIFICATE"
 """
 .. envvar:: OTEL_EXPORTER_JAEGER_CERTIFICATE
@@ -714,13 +669,6 @@
 The :envvar:`OTEL_METRIC_EXPORT_TIMEOUT` is the maximum allowed time (in milliseconds) to export data.
 """
 
-OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY = "OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY"
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY` is the clients private key to use in mTLS communication in PEM format.
-"""
-
 OTEL_METRICS_EXEMPLAR_FILTER = "OTEL_METRICS_EXEMPLAR_FILTER"
 """
 .. envvar:: OTEL_METRICS_EXEMPLAR_FILTER
@@ -737,15 +685,6 @@
 The :envvar:`OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION` is the default aggregation to use for histogram instruments.
 """
 
-OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE = (
-    "OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE"
-)
-"""
-.. envvar:: OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE
-
-The :envvar:`OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE` is the client certificate/chain trust for clients private key to use in mTLS communication in PEM format.
-"""
-
 OTEL_EXPERIMENTAL_RESOURCE_DETECTORS = "OTEL_EXPERIMENTAL_RESOURCE_DETECTORS"
 """
 .. envvar:: OTEL_EXPERIMENTAL_RESOURCE_DETECTORS

pyproject.toml

@@ -103,9 +103,24 @@ pythonVersion = "3.8"
 include = [
   "opentelemetry-semantic-conventions",
   "opentelemetry-api",
+  "opentelemetry-sdk",
+]
+
+exclude = [
+  "opentelemetry-sdk/tests",
+  "opentelemetry-sdk/src/opentelemetry/sdk/_configuration",
+  "opentelemetry-sdk/src/opentelemetry/sdk/_events",
+  "opentelemetry-sdk/src/opentelemetry/sdk/_logs",
+  "opentelemetry-sdk/src/opentelemetry/sdk/error_handler",
+  "opentelemetry-sdk/src/opentelemetry/sdk/resources",
+  "opentelemetry-sdk/src/opentelemetry/sdk/metrics",
+  "opentelemetry-sdk/src/opentelemetry/sdk/trace",
+  "opentelemetry-sdk/src/opentelemetry/sdk/util",
+  "opentelemetry-sdk/benchmarks",
 ]
 
 # When packages are correct typed add them to the strict list
 strict = [
   "opentelemetry-semantic-conventions",
+  "opentelemetry-sdk/src/opentelemetry/sdk/environment_variables",
 ]