Merge branch 'main' into main

xrmx · web-flow · commit 9b8cd611e224 · 2025-10-14T12:27:22.000+02:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -100,6 +100,7 @@
     ("py:class", "CarrierT"),
     ("py:obj", "opentelemetry.propagators.textmap.CarrierT"),
     ("py:obj", "Union"),
+    ("py:data", "typing.Union"),
     (
         "py:class",
         "opentelemetry.sdk.metrics._internal.instrument._Synchronous",

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@`
`100`	`100`	`("py:class", "CarrierT"),`
`101`	`101`	`("py:obj", "opentelemetry.propagators.textmap.CarrierT"),`
`102`	`102`	`("py:obj", "Union"),`
	`103`	`+ ("py:data", "typing.Union"),`
`103`	`104`	`(`
`104`	`105`	`"py:class",`
`105`	`106`	`"opentelemetry.sdk.metrics._internal.instrument._Synchronous",`