Merge branch 'main' into fix/prom-exporter-labels

Author: emdneto

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - prometheus-exporter: fix labels out of place for data points with different
   attribute sets
   ([#4413](https://github.com/open-telemetry/opentelemetry-python/pull/4413))
+- Type indent parameter in to_json
+  ([#4402](https://github.com/open-telemetry/opentelemetry-python/pull/4402))
 - Tolerates exceptions when loading resource detectors via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS`
   ([#4373](https://github.com/open-telemetry/opentelemetry-python/pull/4373))
 - opentelemetry-sdk: fix OTLP exporting of Histograms with explicit buckets advisory
@@ -18,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
 - opentelemetry-exporter-opencensus: better dependency version range for Python 3.13
   ([#4444](https://github.com/open-telemetry/opentelemetry-python/pull/4444))
+- Updated `tracecontext-integration-test` gitref to `d782773b2cf2fa4afd6a80a93b289d8a74ca894d`
+  ([#4448](https://github.com/open-telemetry/opentelemetry-python/pull/4448))
 
 ## Version 1.30.0/0.51b0 (2025-02-03)
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

@@ -217,7 +217,7 @@ def __eq__(self, other: object) -> bool:
             return NotImplemented
         return self.__dict__ == other.__dict__
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return json.dumps(
             {
                 "body": self.body,

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py

@@ -38,7 +38,7 @@ class NumberDataPoint:
     value: Union[int, float]
     exemplars: Sequence[Exemplar] = field(default_factory=list)
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(asdict(self), indent=indent)
 
 
@@ -59,7 +59,7 @@ class HistogramDataPoint:
     max: float
     exemplars: Sequence[Exemplar] = field(default_factory=list)
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(asdict(self), indent=indent)
 
 
@@ -90,7 +90,7 @@ class ExponentialHistogramDataPoint:
     max: float
     exemplars: Sequence[Exemplar] = field(default_factory=list)
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(asdict(self), indent=indent)
 
 
@@ -105,7 +105,7 @@ class ExponentialHistogram:
         "opentelemetry.sdk.metrics.export.AggregationTemporality"
     )
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "data_points": [
@@ -129,7 +129,7 @@ class Sum:
     )
     is_monotonic: bool
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "data_points": [
@@ -151,7 +151,7 @@ class Gauge:
 
     data_points: Sequence[NumberDataPoint]
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "data_points": [
@@ -173,7 +173,7 @@ class Histogram:
         "opentelemetry.sdk.metrics.export.AggregationTemporality"
     )
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "data_points": [
@@ -203,7 +203,7 @@ class Metric:
     unit: Optional[str]
     data: DataT
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "name": self.name,
@@ -223,7 +223,7 @@ class ScopeMetrics:
     metrics: Sequence[Metric]
     schema_url: str
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "scope": loads(self.scope.to_json(indent=indent)),
@@ -245,7 +245,7 @@ class ResourceMetrics:
     scope_metrics: Sequence[ScopeMetrics]
     schema_url: str
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "resource": loads(self.resource.to_json(indent=indent)),
@@ -265,7 +265,7 @@ class MetricsData:
 
     resource_metrics: Sequence[ResourceMetrics]
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "resource_metrics": [

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

@@ -297,7 +297,7 @@ def __hash__(self) -> int:
             f"{dumps(self._attributes.copy(), sort_keys=True)}|{self._schema_url}"  # type: ignore
         )
 
-    def to_json(self, indent: int = 4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         attributes: MutableMapping[str, AttributeValue] = dict(
             self._attributes
         )

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

@@ -483,7 +483,7 @@ def instrumentation_info(self) -> Optional[InstrumentationInfo]:
     def instrumentation_scope(self) -> Optional[InstrumentationScope]:
         return self._instrumentation_scope
 
-    def to_json(self, indent: int = 4):
+    def to_json(self, indent: Optional[int] = 4):
         parent_id = None
         if self.parent is not None:
             parent_id = f"0x{trace_api.format_span_id(self.parent.span_id)}"

opentelemetry-sdk/src/opentelemetry/sdk/util/instrumentation.py

@@ -153,7 +153,7 @@ def name(self) -> str:
     def attributes(self) -> Attributes:
         return self._attributes
 
-    def to_json(self, indent=4) -> str:
+    def to_json(self, indent: Optional[int] = 4) -> str:
         return dumps(
             {
                 "name": self._name,

scripts/tracecontext-integration-test.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e 
 # hard-coding the git tag to ensure stable builds.
-TRACECONTEXT_GIT_TAG="98f210efd89c63593dce90e2bae0a1bdcb986f51"
+TRACECONTEXT_GIT_TAG="d782773b2cf2fa4afd6a80a93b289d8a74ca894d"
 # clone w3c tracecontext tests
 mkdir -p target
 rm -rf ./target/trace-context
@@ -24,4 +24,11 @@ onshutdown()
 }
 trap onshutdown EXIT
 cd ./target/trace-context/test
-python test.py http://127.0.0.1:5000/verify-tracecontext
+
+# The disabled test is not compatible with an optional part of the W3C 
+# spec that we have implemented (dropping duplicated keys from tracestate).
+# W3C are planning to include flags for optional features in the test suite.
+# https://github.com/w3c/trace-context/issues/529
+# FIXME: update test to use flags for optional features when available.
+export SERVICE_ENDPOINT=http://127.0.0.1:5000/verify-tracecontext
+pytest test.py -k "not test_tracestate_duplicated_keys"

tox.ini

@@ -271,6 +271,7 @@ basepython: python3
 deps =
   # needed for tracecontext
   aiohttp~=3.6
+  pytest==7.4.4
   # needed for example trace integration
   flask~=2.3
   requests~=2.7