opentelemetry-sdk: fix a bunch of wrong type imports (#5062)

While at it remove an excluded file from typechecking that has no errors.

Author: xrmx

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

@@ -21,11 +21,11 @@
 from opentelemetry.metrics import Instrument
 from opentelemetry.sdk.metrics._internal.aggregation import (
     Aggregation,
+    AggregationTemporality,
     DefaultAggregation,
     _Aggregation,
     _SumAggregation,
 )
-from opentelemetry.sdk.metrics._internal.export import AggregationTemporality
 from opentelemetry.sdk.metrics._internal.measurement import Measurement
 from opentelemetry.sdk.metrics._internal.point import DataPointT
 from opentelemetry.sdk.metrics._internal.view import View

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

@@ -39,9 +39,11 @@
 
 if TYPE_CHECKING:
     from opentelemetry.sdk.metrics._internal import (
-        MeasurementConsumer,
         _ProxyMeterConfig,
     )
+    from opentelemetry.sdk.metrics._internal.measurement_consumer import (
+        MeasurementConsumer,
+    )
     from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 
 

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

@@ -28,14 +28,14 @@
 )
 from opentelemetry.sdk.metrics._internal.aggregation import (
     Aggregation,
+    AggregationTemporality,
     ExplicitBucketHistogramAggregation,
     _DropAggregation,
     _ExplicitBucketHistogramAggregation,
     _ExponentialBucketHistogramAggregation,
     _LastValueAggregation,
     _SumAggregation,
 )
-from opentelemetry.sdk.metrics._internal.export import AggregationTemporality
 from opentelemetry.sdk.metrics._internal.measurement import Measurement
 from opentelemetry.sdk.metrics._internal.point import (
     ExponentialHistogram,

pyproject.toml

@@ -138,7 +138,6 @@ exclude = [
   "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/instrument.py",
   "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/measurement_consumer.py",
   "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/metric_reader_storage.py",
-  "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py",
   "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/view.py",
   "opentelemetry-sdk/benchmarks",
   "exporter/opentelemetry-exporter-otlp-proto-grpc/tests",