Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions opentelemetry-sdk/src/opentelemetry/sdk/metrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.


from opentelemetry.sdk.metrics import export, view
from opentelemetry.sdk.metrics._internal import Meter, MeterProvider
from opentelemetry.sdk.metrics._internal.exceptions import MetricsTimeoutError
from opentelemetry.sdk.metrics._internal.exemplar import (
Expand Down Expand Up @@ -54,4 +55,6 @@
"SimpleFixedSizeExemplarReservoir",
"UpDownCounter",
"TraceBasedExemplarFilter",
"export",
"view",
]
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def get_meter(
version: Optional[str] = None,
schema_url: Optional[str] = None,
attributes: Optional[Attributes] = None,
) -> Meter:
) -> APIMeter:
if self._disabled:
return NoOpMeter(name, version=version, schema_url=schema_url)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ def consume_measurement(self, measurement: Measurement) -> None:
def register_asynchronous_instrument(
self,
instrument: (
"opentelemetry.sdk.metrics._internal.instrument_Asynchronous"
"opentelemetry.sdk.metrics._internal.instrument._Asynchronous"
),
):
pass

@abstractmethod
def collect(
self,
metric_reader: "opentelemetry.sdk.metrics.MetricReader",
metric_reader: "opentelemetry.sdk.metrics.export.MetricReader",
timeout_millis: float = 10_000,
) -> Optional[MetricsData]:
pass
Expand Down Expand Up @@ -102,7 +102,7 @@ def register_asynchronous_instrument(

def collect(
self,
metric_reader: "opentelemetry.sdk.metrics.MetricReader",
metric_reader: "opentelemetry.sdk.metrics.export.MetricReader",
timeout_millis: float = 10_000,
) -> Optional[MetricsData]:
with self._lock:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
class SdkConfiguration:
exemplar_filter: "opentelemetry.sdk.metrics.ExemplarFilter"
resource: "opentelemetry.sdk.resources.Resource"
metric_readers: Sequence["opentelemetry.sdk.metrics.MetricReader"]
views: Sequence["opentelemetry.sdk.metrics.View"]
metric_readers: Sequence["opentelemetry.sdk.metrics.export.MetricReader"]
views: Sequence["opentelemetry.sdk.metrics.view.View"]
12 changes: 11 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,17 @@ include = [
exclude = [
"opentelemetry-sdk/tests",
"opentelemetry-sdk/src/opentelemetry/sdk/_events",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/__init__.py",
Comment thread
DylanRussell marked this conversation as resolved.
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/_view_instrument_match.py",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/exemplar/exemplar_reservoir.py",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/exponential_histogram/",
"opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/",
"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",
]
Expand Down
Loading