From 694445f6a39ab55826b955320c74650e1d2395ae Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Thu, 21 Mar 2024 14:02:19 -0400 Subject: [PATCH 1/2] Fix license field in pyproject.toml files (#3803) * Fix pyproject.toml Signed-off-by: Yuri Shkuro * changelog Signed-off-by: Yuri Shkuro --------- Signed-off-by: Yuri Shkuro --- CHANGELOG.md | 2 ++ docs/examples/error_handler/error_handler_0/pyproject.toml | 2 +- docs/examples/error_handler/error_handler_1/pyproject.toml | 2 +- exporter/opentelemetry-exporter-opencensus/pyproject.toml | 2 +- .../opentelemetry-exporter-otlp-proto-common/pyproject.toml | 2 +- exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml | 2 +- exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml | 2 +- exporter/opentelemetry-exporter-otlp/pyproject.toml | 2 +- exporter/opentelemetry-exporter-prometheus/pyproject.toml | 2 +- exporter/opentelemetry-exporter-zipkin-json/pyproject.toml | 2 +- .../opentelemetry-exporter-zipkin-proto-http/pyproject.toml | 2 +- exporter/opentelemetry-exporter-zipkin/pyproject.toml | 2 +- opentelemetry-api/pyproject.toml | 2 +- opentelemetry-proto/pyproject.toml | 2 +- opentelemetry-sdk/pyproject.toml | 2 +- opentelemetry-semantic-conventions/pyproject.toml | 2 +- propagator/opentelemetry-propagator-b3/pyproject.toml | 2 +- propagator/opentelemetry-propagator-jaeger/pyproject.toml | 2 +- shim/opentelemetry-opencensus-shim/pyproject.toml | 2 +- shim/opentelemetry-opentracing-shim/pyproject.toml | 2 +- tests/opentelemetry-test-utils/pyproject.toml | 2 +- 21 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be91754d3ef..8d4a7add3c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769)) - Make span.record_exception more robust ([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778)) +- Fix license field in pyproject.toml files + ([#3803](https://github.com/open-telemetry/opentelemetry-python/pull/3803)) ## Version 1.23.0/0.44b0 (2024-02-23) diff --git a/docs/examples/error_handler/error_handler_0/pyproject.toml b/docs/examples/error_handler/error_handler_0/pyproject.toml index 689a4dd0191..7869303c110 100644 --- a/docs/examples/error_handler/error_handler_0/pyproject.toml +++ b/docs/examples/error_handler/error_handler_0/pyproject.toml @@ -7,7 +7,7 @@ name = "error-handler-0" dynamic = ["version"] description = "This is just an error handler example package" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/docs/examples/error_handler/error_handler_1/pyproject.toml b/docs/examples/error_handler/error_handler_1/pyproject.toml index af9ad21d181..b2e04d4a676 100644 --- a/docs/examples/error_handler/error_handler_1/pyproject.toml +++ b/docs/examples/error_handler/error_handler_1/pyproject.toml @@ -7,7 +7,7 @@ name = "error-handler-1" dynamic = ["version"] description = "This is just an error handler example package" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml index abe50f7b7f7..fc2a8f2c2cf 100644 --- a/exporter/opentelemetry-exporter-opencensus/pyproject.toml +++ b/exporter/opentelemetry-exporter-opencensus/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-opencensus" dynamic = ["version"] description = "OpenCensus Exporter" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml index 8043bfbcf9a..3963d60c949 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-common" dynamic = ["version"] description = "OpenTelemetry Protobuf encoding" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml index b6d9e130661..a54c1e86e38 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-grpc" dynamic = ["version"] description = "OpenTelemetry Collector Protobuf over gRPC Exporter" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml index 77a3bcb95b8..f1c88db5c91 100644 --- a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp-proto-http" dynamic = ["version"] description = "OpenTelemetry Collector Protobuf over HTTP Exporter" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml index b61acce885d..7750cfda590 100644 --- a/exporter/opentelemetry-exporter-otlp/pyproject.toml +++ b/exporter/opentelemetry-exporter-otlp/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-otlp" dynamic = ["version"] description = "OpenTelemetry Collector Exporters" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml index 3117ee6afbb..1c3c9e89dd9 100644 --- a/exporter/opentelemetry-exporter-prometheus/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-prometheus" dynamic = ["version"] description = "Prometheus Metric Exporter for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml index 8d18ed5f568..ef34f2fc6ef 100644 --- a/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin-json" dynamic = ["version"] description = "Zipkin Span JSON Exporter for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml index 25e0c95877d..03a400dce75 100644 --- a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin-proto-http" dynamic = ["version"] description = "Zipkin Span Protobuf Exporter for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml index 2d22ea4f24f..7ec3ac135fa 100644 --- a/exporter/opentelemetry-exporter-zipkin/pyproject.toml +++ b/exporter/opentelemetry-exporter-zipkin/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-exporter-zipkin" dynamic = ["version"] description = "Zipkin Span Exporters for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml index cd9dc258b34..3f8f070992d 100644 --- a/opentelemetry-api/pyproject.toml +++ b/opentelemetry-api/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" name = "opentelemetry-api" description = "OpenTelemetry Python API" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/opentelemetry-proto/pyproject.toml b/opentelemetry-proto/pyproject.toml index 4a5ae1de5e0..a31deddcfc1 100644 --- a/opentelemetry-proto/pyproject.toml +++ b/opentelemetry-proto/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-proto" dynamic = ["version"] description = "OpenTelemetry Python Proto" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml index e8718e2d679..ea5d1ec2b0c 100644 --- a/opentelemetry-sdk/pyproject.toml +++ b/opentelemetry-sdk/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-sdk" dynamic = ["version"] description = "OpenTelemetry Python SDK" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml index 290c54b3704..876fb94a985 100644 --- a/opentelemetry-semantic-conventions/pyproject.toml +++ b/opentelemetry-semantic-conventions/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-semantic-conventions" dynamic = ["version"] description = "OpenTelemetry Semantic Conventions" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/propagator/opentelemetry-propagator-b3/pyproject.toml b/propagator/opentelemetry-propagator-b3/pyproject.toml index 736006e74e4..dede9efaa93 100644 --- a/propagator/opentelemetry-propagator-b3/pyproject.toml +++ b/propagator/opentelemetry-propagator-b3/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-propagator-b3" dynamic = ["version"] description = "OpenTelemetry B3 Propagator" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/propagator/opentelemetry-propagator-jaeger/pyproject.toml b/propagator/opentelemetry-propagator-jaeger/pyproject.toml index b716925f439..df8df9a98f8 100644 --- a/propagator/opentelemetry-propagator-jaeger/pyproject.toml +++ b/propagator/opentelemetry-propagator-jaeger/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-propagator-jaeger" dynamic = ["version"] description = "OpenTelemetry Jaeger Propagator" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/shim/opentelemetry-opencensus-shim/pyproject.toml b/shim/opentelemetry-opencensus-shim/pyproject.toml index be92937faed..85f97848097 100644 --- a/shim/opentelemetry-opencensus-shim/pyproject.toml +++ b/shim/opentelemetry-opencensus-shim/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-opencensus-shim" dynamic = ["version"] description = "OpenCensus Shim for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/shim/opentelemetry-opentracing-shim/pyproject.toml b/shim/opentelemetry-opentracing-shim/pyproject.toml index 79507939f4c..0a91ffd7acc 100644 --- a/shim/opentelemetry-opentracing-shim/pyproject.toml +++ b/shim/opentelemetry-opentracing-shim/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-opentracing-shim" dynamic = ["version"] description = "OpenTracing Shim for OpenTelemetry" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml index 6978ba5e22c..9d68cb67088 100644 --- a/tests/opentelemetry-test-utils/pyproject.toml +++ b/tests/opentelemetry-test-utils/pyproject.toml @@ -7,7 +7,7 @@ name = "opentelemetry-test-utils" dynamic = ["version"] description = "Test utilities for OpenTelemetry unit tests" readme = "README.rst" -license = "Apache-2.0" +license = {text = "Apache-2.0"} requires-python = ">=3.8" authors = [ { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, From 29c293fbb120ff8b760519a25e0530b5ab05af83 Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Thu, 21 Mar 2024 18:55:18 -0700 Subject: [PATCH 2/2] Improve tracing sdk type annotations (#3794) * Improve tracing sdk type annotations * Mark instrumentation_scope as optional --- .../src/opentelemetry/sdk/trace/__init__.py | 27 ++++++++-------- .../src/opentelemetry/sdk/trace/sampling.py | 32 ++++++++++--------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py index 5ba183a2cd1..ff999b9ba89 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py @@ -30,6 +30,7 @@ Dict, Iterator, List, + MutableMapping, Optional, Sequence, Tuple, @@ -745,17 +746,17 @@ def __init__( parent: Optional[trace_api.SpanContext] = None, sampler: Optional[sampling.Sampler] = None, trace_config: None = None, # TODO - resource: Resource = None, + resource: Optional[Resource] = None, attributes: types.Attributes = None, - events: Sequence[Event] = None, + events: Optional[Sequence[Event]] = None, links: Sequence[trace_api.Link] = (), kind: trace_api.SpanKind = trace_api.SpanKind.INTERNAL, span_processor: SpanProcessor = SpanProcessor(), - instrumentation_info: InstrumentationInfo = None, + instrumentation_info: Optional[InstrumentationInfo] = None, record_exception: bool = True, set_status_on_exception: bool = True, limits=_UnsetLimits, - instrumentation_scope: InstrumentationScope = None, + instrumentation_scope: Optional[InstrumentationScope] = None, ) -> None: if resource is None: resource = Resource.create({}) @@ -994,7 +995,7 @@ def record_exception( type(exception), value=exception, tb=exception.__traceback__ ) ) - _attributes = { + _attributes: MutableMapping[str, types.AttributeValue] = { "exception.type": exception.__class__.__name__, "exception.message": str(exception), "exception.stacktrace": stacktrace, @@ -1045,7 +1046,7 @@ def start_as_current_span( context: Optional[context_api.Context] = None, kind: trace_api.SpanKind = trace_api.SpanKind.INTERNAL, attributes: types.Attributes = None, - links: Sequence[trace_api.Link] = (), + links: Optional[Sequence[trace_api.Link]] = (), start_time: Optional[int] = None, record_exception: bool = True, set_status_on_exception: bool = True, @@ -1075,7 +1076,7 @@ def start_span( # pylint: disable=too-many-locals context: Optional[context_api.Context] = None, kind: trace_api.SpanKind = trace_api.SpanKind.INTERNAL, attributes: types.Attributes = None, - links: Sequence[trace_api.Link] = (), + links: Optional[Sequence[trace_api.Link]] = (), start_time: Optional[int] = None, record_exception: bool = True, set_status_on_exception: bool = True, @@ -1152,15 +1153,15 @@ class TracerProvider(trace_api.TracerProvider): def __init__( self, - sampler: sampling.Sampler = None, - resource: Resource = None, + sampler: Optional[sampling.Sampler] = None, + resource: Optional[Resource] = None, shutdown_on_exit: bool = True, active_span_processor: Union[ - SynchronousMultiSpanProcessor, ConcurrentMultiSpanProcessor + SynchronousMultiSpanProcessor, ConcurrentMultiSpanProcessor, None ] = None, - id_generator: IdGenerator = None, - span_limits: SpanLimits = None, - ): + id_generator: Optional[IdGenerator] = None, + span_limits: Optional[SpanLimits] = None, + ) -> None: self._active_span_processor = ( active_span_processor or SynchronousMultiSpanProcessor() ) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py index 0236fac6b62..40e142ea1a9 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/sampling.py @@ -184,7 +184,7 @@ def __init__( self, decision: Decision, attributes: "Attributes" = None, - trace_state: "TraceState" = None, + trace_state: Optional["TraceState"] = None, ) -> None: self.decision = decision if attributes is None: @@ -201,10 +201,10 @@ def should_sample( parent_context: Optional["Context"], trace_id: int, name: str, - kind: SpanKind = None, + kind: Optional[SpanKind] = None, attributes: Attributes = None, - links: Sequence["Link"] = None, - trace_state: "TraceState" = None, + links: Optional[Sequence["Link"]] = None, + trace_state: Optional["TraceState"] = None, ) -> "SamplingResult": pass @@ -216,7 +216,7 @@ def get_description(self) -> str: class StaticSampler(Sampler): """Sampler that always returns the same decision.""" - def __init__(self, decision: "Decision"): + def __init__(self, decision: "Decision") -> None: self._decision = decision def should_sample( @@ -224,10 +224,10 @@ def should_sample( parent_context: Optional["Context"], trace_id: int, name: str, - kind: SpanKind = None, + kind: Optional[SpanKind] = None, attributes: Attributes = None, - links: Sequence["Link"] = None, - trace_state: "TraceState" = None, + links: Optional[Sequence["Link"]] = None, + trace_state: Optional["TraceState"] = None, ) -> "SamplingResult": if self._decision is Decision.DROP: attributes = None @@ -285,10 +285,10 @@ def should_sample( parent_context: Optional["Context"], trace_id: int, name: str, - kind: SpanKind = None, + kind: Optional[SpanKind] = None, attributes: Attributes = None, - links: Sequence["Link"] = None, - trace_state: "TraceState" = None, + links: Optional[Sequence["Link"]] = None, + trace_state: Optional["TraceState"] = None, ) -> "SamplingResult": decision = Decision.DROP if trace_id & self.TRACE_ID_LIMIT < self.bound: @@ -340,10 +340,10 @@ def should_sample( parent_context: Optional["Context"], trace_id: int, name: str, - kind: SpanKind = None, + kind: Optional[SpanKind] = None, attributes: Attributes = None, - links: Sequence["Link"] = None, - trace_state: "TraceState" = None, + links: Optional[Sequence["Link"]] = None, + trace_state: Optional["TraceState"] = None, ) -> "SamplingResult": parent_span_context = get_current_span( parent_context @@ -443,7 +443,9 @@ def _get_from_env_or_default() -> Sampler: return _KNOWN_SAMPLERS[trace_sampler] -def _get_parent_trace_state(parent_context) -> Optional["TraceState"]: +def _get_parent_trace_state( + parent_context: Optional[Context], +) -> Optional["TraceState"]: parent_span_context = get_current_span(parent_context).get_span_context() if parent_span_context is None or not parent_span_context.is_valid: return None