resolved merge conflicts

Author: JayeshHire

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 - Enabled the flake8-type-checking plugin rules for ruff linter. These rules do not allow the import of python objects outside the type-checking block, if they are only used for type annotations and are not used at runtime. ([#5029](https://github.com/open-telemetry/opentelemetry-python/pull/5029))
+- `opentelemetry-sdk`: Add shared `_parse_headers` helper for declarative config OTLP exporters
+  ([#5021](https://github.com/open-telemetry/opentelemetry-python/pull/5021))
 - `opentelemetry-api`: Replace a broad exception in attribute cleaning tests to satisfy pylint in the `lint-opentelemetry-api` CI job
 - `opentelemetry-sdk`: Add `create_resource` and `create_propagator`/`configure_propagator` to declarative file configuration, enabling Resource and propagator instantiation from config files without reading env vars
   ([#4979](https://github.com/open-telemetry/opentelemetry-python/pull/4979))
@@ -42,6 +44,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4910](https://github.com/open-telemetry/opentelemetry-python/pull/4910))
 - Add configurable `max_export_batch_size` to OTLP HTTP metrics exporter
   ([#4576](https://github.com/open-telemetry/opentelemetry-python/pull/4576))
+- `opentelemetry-sdk`: Implement experimental Meter configurator
+  ([#4966](https://github.com/open-telemetry/opentelemetry-python/pull/4966))
+- `opentelemetry-exporter-otlp-proto-http`: use consistent protobuf for export request
+  ([#5015](https://github.com/open-telemetry/opentelemetry-python/pull/5015))
+- `opentelemetry-sdk`: cache TracerConfig into the tracer, this changes an internal interface. Only one Tracer with the same instrumentation scope will be created
+  ([#5007](https://github.com/open-telemetry/opentelemetry-python/pull/5007))
 
 ## Version 1.40.0/0.61b0 (2026-03-04)
 

docs/conf.py

@@ -228,11 +228,11 @@
 scm_web = "https://github.com/" + REPO + "blob/" + branch
 
 # Store variables in the epilogue so they are globally available.
-rst_epilog = """
-.. |SCM_WEB| replace:: {s}
-.. |SCM_RAW_WEB| replace:: {sr}
-.. |SCM_BRANCH| replace:: {b}
-""".format(s=scm_web, sr=scm_raw_web, b=branch)
+rst_epilog = f"""
+.. |SCM_WEB| replace:: {scm_web}
+.. |SCM_RAW_WEB| replace:: {scm_raw_web}
+.. |SCM_BRANCH| replace:: {branch}
+"""
 
 # used to have links to repo files
 extlinks = {

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/__init__.py

@@ -173,7 +173,7 @@ def _get_resource_data(
             resource_class(
                 **{
                     "resource": collector_resource,
-                    "scope_{}".format(name): scope_data.values(),
+                    f"scope_{name}": scope_data.values(),
                 }
             )
         )

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

@@ -155,9 +155,7 @@
 class InvalidCompressionValueException(Exception):
     def __init__(self, environ_key: str, environ_value: str):
         super().__init__(
-            'Invalid value "{}" for compression envvar {}'.format(
-                environ_value, environ_key
-            )
+            f'Invalid value "{environ_value}" for compression envvar {environ_key}'
         )
 
 

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

@@ -19,9 +19,6 @@
 
 from opentelemetry.sdk.environment_variables import (
     _OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
 )
 from opentelemetry.util._importlib_metadata import entry_points
 
@@ -36,9 +33,9 @@ def _is_retryable(resp: requests.Response) -> bool:
 
 def _load_session_from_envvar(
     cred_envvar: Literal[
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER",
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER",
     ],
 ) -> Optional[requests.Session]:
     _credential_env = environ.get(

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

@@ -51,7 +51,7 @@
     _is_retryable,
     _load_session_from_envvar,
 )
-from opentelemetry.proto.collector.metrics.v1.metrics_service_pb2 import (  # noqa: F401
+from opentelemetry.proto.collector.metrics.v1.metrics_service_pb2 import (
     ExportMetricsServiceRequest,
 )
 from opentelemetry.proto.common.v1.common_pb2 import (  # noqa: F401
@@ -61,7 +61,7 @@
     KeyValue,
     KeyValueList,
 )
-from opentelemetry.proto.metrics.v1 import metrics_pb2 as pb2  # noqa: F401
+from opentelemetry.proto.metrics.v1 import metrics_pb2 as pb2
 from opentelemetry.proto.resource.v1.resource_pb2 import Resource  # noqa: F401
 from opentelemetry.sdk.environment_variables import (
     _OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
@@ -246,18 +246,19 @@ def _export(
 
     def _export_with_retries(
         self,
-        serialized_data: bytes,
+        export_request: ExportMetricsServiceRequest,
         deadline_sec: float,
     ) -> MetricExportResult:
         """Export serialized data with retry logic until success, non-transient error, or exponential backoff maxed out.
 
         Args:
-            serialized_data: serialized metrics data to export
+            export_request: ExportMetricsServiceRequest object containing metrics data to export
             deadline_sec: timestamp deadline for the export
 
         Returns:
             MetricExportResult: SUCCESS if export succeeded, FAILURE otherwise
         """
+        serialized_data = export_request.SerializeToString()
         for retry_num in range(_MAX_RETRYS):
             # multiplying by a random number between .8 and 1.2 introduces a +/20% jitter to each backoff.
             backoff_seconds = 2**retry_num * random.uniform(0.8, 1.2)
@@ -313,23 +314,21 @@ def export(
             _logger.warning("Exporter already shutdown, ignoring batch")
             return MetricExportResult.FAILURE
 
-        serialized_data = encode_metrics(metrics_data)
+        export_request = encode_metrics(metrics_data)
         deadline_sec = time() + self._timeout
 
         # If no batch size configured, export as single batch with retries as configured
         if self._max_export_batch_size is None:
-            return self._export_with_retries(
-                serialized_data.SerializeToString(), deadline_sec
-            )
+            return self._export_with_retries(export_request, deadline_sec)
 
         # Else, export in batches of configured size
-        split_metrics_batches = list(
-            _split_metrics_data(serialized_data, self._max_export_batch_size)
+        batched_export_requests = _split_metrics_data(
+            export_request, self._max_export_batch_size
         )
 
-        for split_metrics_data in split_metrics_batches:
+        for split_metrics_data in batched_export_requests:
             export_result = self._export_with_retries(
-                split_metrics_data.SerializeToString(),
+                split_metrics_data,
                 deadline_sec,
             )
             if export_result != MetricExportResult.SUCCESS:
@@ -356,18 +355,18 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
 
 
 def _split_metrics_data(
-    metrics_data: pb2.MetricsData,
+    metrics_data: ExportMetricsServiceRequest,
     max_export_batch_size: int | None = None,
-) -> Iterable[pb2.MetricsData]:
-    """Splits metrics data into several MetricsData (copies protobuf originals),
+) -> Iterable[ExportMetricsServiceRequest]:
+    """Splits metrics data into several ExportMetricsServiceRequest (copies protobuf originals),
     based on configured data point max export batch size.
 
     Args:
         metrics_data: metrics object based on HTTP protocol buffer definition
 
     Returns:
-        Iterable[pb2.MetricsData]: An iterable of pb2.MetricsData objects containing
-            pb2.ResourceMetrics, pb2.ScopeMetrics, pb2.Metrics, and data points
+        Iterable[ExportMetricsServiceRequest]: An iterable of ExportMetricsServiceRequest objects containing
+            ExportMetricsServiceRequest.ResourceMetrics, ExportMetricsServiceRequest.ScopeMetrics, ExportMetricsServiceRequest.Metrics, and data points
     """
     if not max_export_batch_size:
         return metrics_data
@@ -433,7 +432,7 @@ def _split_metrics_data(
                     batch_size += 1
 
                     if batch_size >= max_export_batch_size:
-                        yield pb2.MetricsData(
+                        yield ExportMetricsServiceRequest(
                             resource_metrics=_get_split_resource_metrics_pb2(
                                 split_resource_metrics
                             )
@@ -447,6 +446,11 @@ def _split_metrics_data(
 
                         # Rebuild metric dict generically using same approach as initial creation
                         field_name = metric.WhichOneof("data")
+                        if field_name is None:
+                            _logger.warning(
+                                "Tried to split and export an unsupported metric type. Skipping."
+                            )
+                            continue
                         data_container = getattr(metric, field_name)
                         metric_dict = {
                             "name": metric.name,
@@ -494,7 +498,7 @@ def _split_metrics_data(
             split_resource_metrics.pop()
 
     if batch_size > 0:
-        yield pb2.MetricsData(
+        yield ExportMetricsServiceRequest(
             resource_metrics=_get_split_resource_metrics_pb2(
                 split_resource_metrics
             )
@@ -556,13 +560,13 @@ def _get_split_resource_metrics_pb2(
         new_resource_metrics = pb2.ResourceMetrics(
             resource=resource_metrics.get("resource"),
             scope_metrics=[],
-            schema_url=resource_metrics.get("schema_url"),
+            schema_url=resource_metrics.get("schema_url") or "",
         )
         for scope_metrics in resource_metrics.get("scope_metrics", []):
             new_scope_metrics = pb2.ScopeMetrics(
                 scope=scope_metrics.get("scope"),
                 metrics=[],
-                schema_url=scope_metrics.get("schema_url"),
+                schema_url=scope_metrics.get("schema_url") or "",
             )
 
             for metric in scope_metrics.get("metrics", []):