Merge branch 'main' into get-tracer-doc-string

Author: xrmx

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- `opentelemetry-sdk`: Drop unused Jaeger exporter environment variables (exporter removed in 1.22.0)
+  ([#4918](https://github.com/open-telemetry/opentelemetry-python/issues/4918))
+- `opentelemetry-sdk`: Clarify timeout units in environment variable documentation
+  ([#4906](https://github.com/open-telemetry/opentelemetry-python/pull/4906))
 - `opentelemetry-exporter-otlp-proto-grpc`: Fix re-initialization of gRPC channel on UNAVAILABLE error
   ([#4825](https://github.com/open-telemetry/opentelemetry-python/pull/4825))
 - `opentelemetry-exporter-prometheus`: Fix duplicate HELP/TYPE declarations for metrics with different label sets
@@ -30,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4806](https://github.com/open-telemetry/opentelemetry-python/pull/4806))
 - Prevent possible endless recursion from happening in `SimpleLogRecordProcessor.on_emit`,
   ([#4799](https://github.com/open-telemetry/opentelemetry-python/pull/4799)) and ([#4867](https://github.com/open-telemetry/opentelemetry-python/pull/4867)).
+- Implement span start/end metrics
+  ([#4880](https://github.com/open-telemetry/opentelemetry-python/pull/4880))
 - Add environment variable carriers to API
   ([#4609](https://github.com/open-telemetry/opentelemetry-python/pull/4609))
 - Add experimental composable rule based sampler
@@ -38,6 +44,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4862](https://github.com/open-telemetry/opentelemetry-python/pull/4862))
 - `opentelemetry-exporter-otlp-proto-http`: fix retry logic and error handling for connection failures in trace, metric, and log exporters
   ([#4709](https://github.com/open-telemetry/opentelemetry-python/pull/4709))
+- `opentelemetry-sdk`: avoid RuntimeError during iteration of view instrument match dictionary in MetricReaderStorage.collect()
+  ([#4891](https://github.com/open-telemetry/opentelemetry-python/pull/4891))
+- Implement experimental TracerConfigurator
+  ([#4861](https://github.com/open-telemetry/opentelemetry-python/pull/4861))
+- bump semantic-conventions to v1.39.0
+  ([#4914](https://github.com/open-telemetry/opentelemetry-python/pull/4914))
 
 ## Version 1.39.0/0.60b0 (2025-12-03)
 
@@ -47,8 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734))
 - build: bump ruff to 0.14.1
   ([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782))
-- Add `opentelemetry-exporter-credential-provider-gcp` as an optional dependency to `opentelemetry-exporter-otlp-proto-grpc` 
-  and `opentelemetry-exporter-otlp-proto-http` 
+- Add `opentelemetry-exporter-credential-provider-gcp` as an optional dependency to `opentelemetry-exporter-otlp-proto-grpc`
+  and `opentelemetry-exporter-otlp-proto-http`
   ([#4760](https://github.com/open-telemetry/opentelemetry-python/pull/4760))
 - feat: implement on ending in span processor
   ([#4775](https://github.com/open-telemetry/opentelemetry-python/pull/4775))
@@ -60,29 +72,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4647](https://github.com/open-telemetry/opentelemetry-python/pull/4647))
 
   **Migration Guide:**
-  
+
   `LogData` has been removed. Users should update their code as follows:
-  
+
   - **For Log Exporters:** Change from `Sequence[LogData]` to `Sequence[ReadableLogRecord]`
     ```python
     # Before
     from opentelemetry.sdk._logs import LogData
     def export(self, batch: Sequence[LogData]) -> LogRecordExportResult:
         ...
-    
+
     # After
     from opentelemetry.sdk._logs import ReadableLogRecord
     def export(self, batch: Sequence[ReadableLogRecord]) -> LogRecordExportResult:
         ...
     ```
-  
+
   - **For Log Processors:** Use `ReadWriteLogRecord` for processing, `ReadableLogRecord` for exporting
     ```python
     # Before
     from opentelemetry.sdk._logs import LogData
     def on_emit(self, log_data: LogData):
         ...
-    
+
     # After
     from opentelemetry.sdk._logs import ReadWriteLogRecord, ReadableLogRecord
     def on_emit(self, log_record: ReadWriteLogRecord):
@@ -95,7 +107,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
         )
         ...
     ```
-  
+
   - **Accessing log data:** Use the same attributes on `ReadableLogRecord`/`ReadWriteLogRecord`
     - `log_record.log_record` - The API LogRecord (contains body, severity, attributes, etc.)
     - `log_record.resource` - The Resource

docs/examples/opencensus-shim/app.py

@@ -31,7 +31,7 @@
 
 # Set up OpenTelemetry
 tracer_provider = TracerProvider(
-    resource=Resource(
+    resource=Resource.create(
         {
             "service.name": "opencensus-shim-example-flask",
         }

docs/exporter/prometheus/prometheus.rst

@@ -27,7 +27,7 @@ Prometheus text format on request::
     from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 
     # Service name is required for most backends
-    resource = Resource(attributes={
+    resource = Resource.create(attributes={
         SERVICE_NAME: "your-service-name"
     })
 

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

@@ -50,7 +50,7 @@
 
     # Resource can be required for some backends, e.g. Jaeger
     # If resource wouldn't be set - traces wouldn't appears in Jaeger
-    resource = Resource(attributes={
+    resource = Resource.create({
         "service.name": "service"
     })
 

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

@@ -50,7 +50,7 @@
 
     # Resource can be required for some backends, e.g. Jaeger
     # If resource wouldn't be set - traces wouldn't appears in Jaeger
-    resource = Resource(attributes={
+    resource = Resource.create({
         "service.name": "service"
     })
 

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

@@ -471,7 +471,21 @@ def start_span(
         record_exception: bool = True,
         set_status_on_exception: bool = True,
     ) -> "Span":
-        return INVALID_SPAN
+        current_span = get_current_span(context)
+        if isinstance(current_span, NonRecordingSpan):
+            return current_span
+        parent_span_context = current_span.get_span_context()
+        if parent_span_context is not None and not isinstance(
+            parent_span_context, SpanContext
+        ):
+            logger.warning(
+                "Invalid span context for %s: %s",
+                current_span,
+                parent_span_context,
+            )
+            return INVALID_SPAN
+
+        return NonRecordingSpan(context=parent_span_context)
 
     @_agnosticcontextmanager
     def start_as_current_span(
@@ -486,7 +500,23 @@ def start_as_current_span(
         set_status_on_exception: bool = True,
         end_on_exit: bool = True,
     ) -> Iterator["Span"]:
-        yield INVALID_SPAN
+        span = self.start_span(
+            name=name,
+            context=context,
+            kind=kind,
+            attributes=attributes,
+            links=links,
+            start_time=start_time,
+            record_exception=record_exception,
+            set_status_on_exception=set_status_on_exception,
+        )
+        with use_span(
+            span,
+            end_on_exit=end_on_exit,
+            record_exception=record_exception,
+            set_status_on_exception=set_status_on_exception,
+        ) as span:
+            yield span
 
 
 @deprecated("You should use NoOpTracer. Deprecated since version 1.9.0.")

opentelemetry-api/tests/test_implementation.py

@@ -17,6 +17,63 @@
 from opentelemetry import trace
 
 
+class RecordingSpan(trace.Span):
+    def __init__(self, context: trace.SpanContext) -> None:
+        self._context = context
+
+    def get_span_context(self) -> trace.SpanContext:
+        return self._context
+
+    def is_recording(self) -> bool:
+        return True
+
+    def end(self, end_time=None) -> None:
+        pass
+
+    def set_attributes(self, attributes) -> None:
+        pass
+
+    def set_attribute(self, key, value) -> None:
+        pass
+
+    def add_event(
+        self,
+        name: str,
+        attributes=None,
+        timestamp=None,
+    ) -> None:
+        pass
+
+    def add_link(
+        self,
+        context,
+        attributes=None,
+    ) -> None:
+        pass
+
+    def update_name(self, name) -> None:
+        pass
+
+    def set_status(
+        self,
+        status,
+        description=None,
+    ) -> None:
+        pass
+
+    def record_exception(
+        self,
+        exception,
+        attributes=None,
+        timestamp=None,
+        escaped=False,
+    ) -> None:
+        pass
+
+    def __repr__(self) -> str:
+        return f"RecordingSpan({self._context!r})"
+
+
 class TestAPIOnlyImplementation(unittest.TestCase):
     """
     This test is in place to ensure the API is returning values that
@@ -36,18 +93,45 @@ def test_default_tracer(self):
         tracer_provider = trace.NoOpTracerProvider()
         tracer = tracer_provider.get_tracer(__name__)
         with tracer.start_span("test") as span:
-            self.assertEqual(
-                span.get_span_context(), trace.INVALID_SPAN_CONTEXT
-            )
-            self.assertEqual(span, trace.INVALID_SPAN)
+            self.assertFalse(span.get_span_context().is_valid)
             self.assertIs(span.is_recording(), False)
             with tracer.start_span("test2") as span2:
-                self.assertEqual(
-                    span2.get_span_context(), trace.INVALID_SPAN_CONTEXT
-                )
-                self.assertEqual(span2, trace.INVALID_SPAN)
+                self.assertFalse(span2.get_span_context().is_valid)
                 self.assertIs(span2.is_recording(), False)
 
+    def test_default_tracer_context_propagation_recording_span(self):
+        tracer_provider = trace.NoOpTracerProvider()
+        tracer = tracer_provider.get_tracer(__name__)
+        span_context = trace.SpanContext(
+            2604504634922341076776623263868986797,
+            5213367945872657620,
+            False,
+            trace.TraceFlags(0x01),
+        )
+        ctx = trace.set_span_in_context(RecordingSpan(context=span_context))
+        with tracer.start_span("test", context=ctx) as span:
+            self.assertTrue(span.get_span_context().is_valid)
+            self.assertEqual(span.get_span_context(), span_context)
+            self.assertIs(span.is_recording(), False)
+
+    def test_default_tracer_context_propagation_non_recording_span(self):
+        tracer_provider = trace.NoOpTracerProvider()
+        tracer = tracer_provider.get_tracer(__name__)
+        ctx = trace.set_span_in_context(trace.INVALID_SPAN)
+        with tracer.start_span("test", context=ctx) as span:
+            self.assertFalse(span.get_span_context().is_valid)
+            self.assertIs(span, trace.INVALID_SPAN)
+
+    def test_default_tracer_context_propagation_with_invalid_context(self):
+        tracer_provider = trace.NoOpTracerProvider()
+        tracer = tracer_provider.get_tracer(__name__)
+        ctx = trace.set_span_in_context(
+            RecordingSpan(context="invalid_context")  # type: ignore[reportArgumentType]
+        )
+        with tracer.start_span("test", context=ctx) as span:
+            self.assertFalse(span.get_span_context().is_valid)
+            self.assertIs(span, trace.INVALID_SPAN)
+
     def test_span(self):
         with self.assertRaises(TypeError):
             # pylint: disable=abstract-class-instantiated

opentelemetry-api/tests/trace/test_proxy.py

@@ -96,8 +96,8 @@ def my_function() -> Span:
             return trace.get_current_span()
 
         # call function before configuring tracing provider, should
-        # return INVALID_SPAN from the NoOpTracer
-        self.assertEqual(my_function(), trace.INVALID_SPAN)
+        # return NonRecordingSpan from the NoOpTracer
+        self.assertFalse(my_function().is_recording())
 
         # configure tracing provider
         trace.set_tracer_provider(TestProvider())

opentelemetry-api/tests/trace/test_tracer.py

@@ -79,5 +79,5 @@ async def function_async(data: str) -> int:
     def test_get_current_span(self):
         with self.tracer.start_as_current_span("test") as span:
             get_current_span().set_attribute("test", "test")
-            self.assertEqual(span, INVALID_SPAN)
+            self.assertFalse(span.is_recording())
             self.assertFalse(hasattr("span", "attributes"))

opentelemetry-sdk/benchmarks/trace/test_benchmark_trace.py

@@ -12,8 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import lru_cache
+
+import pytest
+
 from opentelemetry.sdk.resources import Resource
-from opentelemetry.sdk.trace import TracerProvider, sampling
+from opentelemetry.sdk.trace import (
+    TracerProvider,
+    _default_tracer_configurator,
+    _RuleBasedTracerConfigurator,
+    _scope_name_matches_glob,
+    _TracerConfig,
+    sampling,
+)
 
 tracer = TracerProvider(
     sampler=sampling.DEFAULT_ON,
@@ -27,16 +38,61 @@
 ).get_tracer("sdk_tracer_provider")
 
 
+@pytest.fixture(params=[None, 0, 1, 10, 50])
+def num_tracer_configurator_rules(request):
+    return request.param
+
+
 def test_simple_start_span(benchmark):
-    def benchmark_start_as_current_span():
+    def benchmark_start_span():
         span = tracer.start_span(
             "benchmarkedSpan",
             attributes={"long.attribute": -10000000001000000000},
         )
         span.add_event("benchmarkEvent")
         span.end()
 
-    benchmark(benchmark_start_as_current_span)
+    benchmark(benchmark_start_span)
+
+
+# pylint: disable=protected-access,redefined-outer-name
+def test_simple_start_span_with_tracer_configurator_rules(
+    benchmark, num_tracer_configurator_rules
+):
+    def benchmark_start_span():
+        span = tracer.start_span(
+            "benchmarkedSpan",
+            attributes={"long.attribute": -10000000001000000000},
+        )
+        span.add_event("benchmarkEvent")
+        span.end()
+
+    @lru_cache
+    def tracer_configurator(tracer_scope):
+        # this is testing 100 rules that is an extreme case
+        return _RuleBasedTracerConfigurator(
+            rules=[
+                (
+                    _scope_name_matches_glob(glob_pattern=str(i)),
+                    _TracerConfig(is_enabled=True),
+                )
+                for i in range(num_tracer_configurator_rules)
+            ],
+            default_config=_TracerConfig(is_enabled=True),
+        )(tracer_scope=tracer_scope)
+
+    tracer_provider = tracer._tracer_provider
+    tracer_provider._set_tracer_configurator(
+        tracer_configurator=tracer_configurator
+    )
+    if num_tracer_configurator_rules is None:
+        tracer._tracer_provider = None
+    benchmark(benchmark_start_span)
+    tracer_provider._set_tracer_configurator(
+        tracer_configurator=_default_tracer_configurator
+    )
+    if num_tracer_configurator_rules is None:
+        tracer._tracer_provider = tracer_provider
 
 
 def test_simple_start_as_current_span(benchmark):