From 098929a372cad8075be7890c079210588912d631 Mon Sep 17 00:00:00 2001 From: Krzysztof Jagiello Date: Sun, 1 Sep 2024 19:17:08 +0200 Subject: [PATCH] Fix the py.typed marker file usage As defined in PEP 561, the py.typed marker files for namespace packages should be placed "in the submodules of the namespace". In commit 732ea8a, the markers were added to the subpackage roots, which serves no purpose. This changeset addresses all marker-related issues in this repository. A summary of the changes: - Removed the unnecessary py.typed markers from the subpackage roots. - Added the missing marker to the prometheus exporter. Fixes #4113. - Added the missing marker to opentelemetry._events. - Removed the accidentally reintroduced jaeger exporters, which were originally removed in commit 1625b35. --- CHANGELOG.md | 3 +++ exporter/opentelemetry-exporter-opencensus/py.typed | 0 exporter/opentelemetry-exporter-otlp-proto-common/py.typed | 0 exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed | 0 exporter/opentelemetry-exporter-otlp-proto-http/py.typed | 0 exporter/opentelemetry-exporter-otlp/py.typed | 0 exporter/opentelemetry-exporter-prometheus/py.typed | 0 .../src/opentelemetry/exporter/prometheus}/py.typed | 0 exporter/opentelemetry-exporter-zipkin-json/py.typed | 0 exporter/opentelemetry-exporter-zipkin-proto-http/py.typed | 0 exporter/opentelemetry-exporter-zipkin/py.typed | 0 opentelemetry-api/py.typed | 0 .../src/opentelemetry/_events}/py.typed | 0 opentelemetry-proto/py.typed | 0 .../src/opentelemetry/proto}/py.typed | 0 opentelemetry-sdk/py.typed | 0 opentelemetry-semantic-conventions/py.typed | 0 17 files changed, 3 insertions(+) delete mode 100644 exporter/opentelemetry-exporter-opencensus/py.typed delete mode 100644 exporter/opentelemetry-exporter-otlp-proto-common/py.typed delete mode 100644 exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed delete mode 100644 exporter/opentelemetry-exporter-otlp-proto-http/py.typed delete mode 100644 exporter/opentelemetry-exporter-otlp/py.typed delete mode 100644 exporter/opentelemetry-exporter-prometheus/py.typed rename exporter/{opentelemetry-exporter-jaeger-proto-grpc => opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus}/py.typed (100%) delete mode 100644 exporter/opentelemetry-exporter-zipkin-json/py.typed delete mode 100644 exporter/opentelemetry-exporter-zipkin-proto-http/py.typed delete mode 100644 exporter/opentelemetry-exporter-zipkin/py.typed delete mode 100644 opentelemetry-api/py.typed rename {exporter/opentelemetry-exporter-jaeger-thrift => opentelemetry-api/src/opentelemetry/_events}/py.typed (100%) delete mode 100644 opentelemetry-proto/py.typed rename {exporter/opentelemetry-exporter-jaeger => opentelemetry-proto/src/opentelemetry/proto}/py.typed (100%) delete mode 100644 opentelemetry-sdk/py.typed delete mode 100644 opentelemetry-semantic-conventions/py.typed diff --git a/CHANGELOG.md b/CHANGELOG.md index de7013d0cbf..2909451bbe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +- Removed superfluous py.typed markers and added them where they were missing + ([#4172](https://github.com/open-telemetry/opentelemetry-python/pull/4172)) + ## Version 1.27.0/0.48b0 (2024-08-28) - Implementation of Events API diff --git a/exporter/opentelemetry-exporter-opencensus/py.typed b/exporter/opentelemetry-exporter-opencensus/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/py.typed b/exporter/opentelemetry-exporter-otlp-proto-common/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed b/exporter/opentelemetry-exporter-otlp-proto-grpc/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/py.typed b/exporter/opentelemetry-exporter-otlp-proto-http/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-otlp/py.typed b/exporter/opentelemetry-exporter-otlp/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-prometheus/py.typed b/exporter/opentelemetry-exporter-prometheus/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/py.typed b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/py.typed similarity index 100% rename from exporter/opentelemetry-exporter-jaeger-proto-grpc/py.typed rename to exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/py.typed diff --git a/exporter/opentelemetry-exporter-zipkin-json/py.typed b/exporter/opentelemetry-exporter-zipkin-json/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/py.typed b/exporter/opentelemetry-exporter-zipkin-proto-http/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-zipkin/py.typed b/exporter/opentelemetry-exporter-zipkin/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/opentelemetry-api/py.typed b/opentelemetry-api/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/py.typed b/opentelemetry-api/src/opentelemetry/_events/py.typed similarity index 100% rename from exporter/opentelemetry-exporter-jaeger-thrift/py.typed rename to opentelemetry-api/src/opentelemetry/_events/py.typed diff --git a/opentelemetry-proto/py.typed b/opentelemetry-proto/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/exporter/opentelemetry-exporter-jaeger/py.typed b/opentelemetry-proto/src/opentelemetry/proto/py.typed similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/py.typed rename to opentelemetry-proto/src/opentelemetry/proto/py.typed diff --git a/opentelemetry-sdk/py.typed b/opentelemetry-sdk/py.typed deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/opentelemetry-semantic-conventions/py.typed b/opentelemetry-semantic-conventions/py.typed deleted file mode 100644 index e69de29bb2d..00000000000