Refactor metrics SDK paths (#2670)

* Refactor metrics SDK paths

Fixes #2666

* Add fix for 3.6

* Fix OTLP metrics exporter

* Address some feedback

* Address more feedback

* Add comments explaining imports

* Add view module

Co-authored-by: Srikanth Chekuri <[email protected]>

Author: ocelotl

docs/conf.py

@@ -97,6 +97,14 @@
 # https://github.com/sphinx-doc/sphinx/pull/3744
 nitpick_ignore = [
     ("py:class", "ValueT"),
+    (
+        "py:class",
+        "opentelemetry.sdk._metrics._internal.instrument._Synchronous",
+    ),
+    (
+        "py:class",
+        "opentelemetry.sdk._metrics._internal.instrument._Asynchronous",
+    ),
     # Even if wrapt is added to intersphinx_mapping, sphinx keeps failing
     # with "class reference target not found: ObjectProxy".
     ("py:class", "ObjectProxy"),

docs/sdk/metrics.aggregation.rst

@@ -13,11 +13,8 @@ Submodules
 
 .. toctree::
 
-   metrics.view
-   metrics.aggregation
-   metrics.metric_reader
-   metrics.point
    metrics.export
+   metrics.view
 
 .. automodule:: opentelemetry.sdk._metrics
     :members:

docs/sdk/metrics.metric_reader.rst

@@ -1,5 +1,5 @@
 opentelemetry.sdk._metrics.view
-==========================================
+===============================
 
 .. automodule:: opentelemetry.sdk._metrics.view
     :members:

docs/sdk/metrics.point.rst

@@ -30,7 +30,7 @@
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_METRICS_INSECURE,
 )
-from opentelemetry.sdk._metrics.point import (
+from opentelemetry.sdk._metrics.export import (
     Gauge,
     Histogram,
     Metric,

docs/sdk/metrics.rst

@@ -40,8 +40,11 @@
 from opentelemetry.proto.resource.v1.resource_pb2 import (
     Resource as OTLPResource,
 )
-from opentelemetry.sdk._metrics.export import MetricExportResult
-from opentelemetry.sdk._metrics.point import AggregationTemporality, Histogram
+from opentelemetry.sdk._metrics.export import (
+    AggregationTemporality,
+    Histogram,
+    MetricExportResult,
+)
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_METRICS_INSECURE,
 )

docs/sdk/metrics.view.rst

@@ -77,8 +77,13 @@
 )
 from prometheus_client.core import Metric as PrometheusMetric
 
-from opentelemetry.sdk._metrics.metric_reader import MetricReader
-from opentelemetry.sdk._metrics.point import Gauge, Histogram, Metric, Sum
+from opentelemetry.sdk._metrics.export import (
+    Gauge,
+    Histogram,
+    Metric,
+    MetricReader,
+    Sum,
+)
 
 _logger = getLogger(__name__)
 

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

@@ -23,7 +23,7 @@
     PrometheusMetricReader,
     _CustomCollector,
 )
-from opentelemetry.sdk._metrics.point import AggregationTemporality, Histogram
+from opentelemetry.sdk._metrics.export import AggregationTemporality, Histogram
 from opentelemetry.test.metrictestutil import (
     _generate_gauge,
     _generate_metric,