fix type

open-telemetry · Sep 26, 2019 · cedcd1e · cedcd1e
1 parent 4b03cb7
commit cedcd1e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/opentelemetry-api/src/opentelemetry/metrics/__init__.py b/opentelemetry-api/src/opentelemetry/metrics/__init__.py
@@ -43,17 +43,17 @@ class DefaultMetricHandle:
 
 
 class CounterHandle:
-    def add(self, value: Type[_ValueT]) -> None:
+    def add(self, value: _ValueT) -> None:
         """Increases the value of the handle by ``value``"""
 
 
 class GaugeHandle:
-    def set(self, value: Type[_ValueT]) -> None:
+    def set(self, value: _ValueT) -> None:
         """Sets the current value of the handle to ``value``."""
 
 
 class MeasureHandle:
-    def record(self, value: Type[_ValueT]) -> None:
+    def record(self, value: _ValueT) -> None:
         """Records the given ``value`` to this handle."""
 
 
@@ -123,6 +123,7 @@ def get_handle(self, label_values: Tuple[str, ...]) -> "MeasureHandle":
         """Gets a `MeasureHandle` with a float value."""
         return MeasureHandle()
 
+
 _MetricT = TypeVar("_MetricT", Counter, Gauge, Measure)
 
 
@@ -138,7 +139,7 @@ class Meter:
     def record_batch(
         self,
         label_values: Tuple[str, ...],
-        record_tuples: Tuple[Tuple["Metric", Type[_ValueT]]],
+        record_tuples: Tuple[Tuple["Metric", _ValueT]],
     ) -> None:
         """Atomically records a batch of `Metric` and value pairs.
 

diff --git a/opentelemetry-api/tests/metrics/test_metrics.py b/opentelemetry-api/tests/metrics/test_metrics.py
@@ -23,7 +23,8 @@ def setUp(self):
         self.meter = metrics.Meter()
 
     def test_record_batch(self):
-        self.meter.record_batch((), ())
+        counter = metrics.Counter()
+        self.meter.record_batch(("values"), ((counter, 1)))
 
     def test_create_metric(self):
         metric = self.meter.create_metric("", "", "", float, metrics.Counter)

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/__init__.py
@@ -22,7 +22,10 @@
 
 class BaseHandle:
     def __init__(
-        self, value_type: metrics_api._ValueT, enabled: bool, monotonic: bool
+        self,
+        value_type: Type[metrics_api._ValueT],
+        enabled: bool,
+        monotonic: bool,
     ):
         self.data = 0
         self.value_type = value_type
@@ -84,7 +87,7 @@ def __init__(
         name: str,
         description: str,
         unit: str,
-        value_type: metrics_api._ValueT,
+        value_type: Type[metrics_api._ValueT],
         label_keys: Tuple[str, ...] = None,
         enabled: bool = True,
         monotonic: bool = False,
@@ -98,13 +101,13 @@ def __init__(
         self.monotonic = monotonic
         self.handles = {}
 
-    def get_handle(
-        self, label_values: Tuple[str, ...]
-    ) -> BaseHandle:
+    def get_handle(self, label_values: Tuple[str, ...]) -> BaseHandle:
         """See `opentelemetry.metrics.Metric.get_handle`."""
         handle = self.handles.get(label_values)
         if not handle:
-            handle = self.__class__.HANDLE_TYPE(self.value_type, self.enabled, self.monotonic)
+            handle = self.__class__.HANDLE_TYPE(
+                self.value_type, self.enabled, self.monotonic
+            )
         self.handles[label_values] = handle
         return handle
 
@@ -124,7 +127,7 @@ def __init__(
         name: str,
         description: str,
         unit: str,
-        value_type: metrics_api._ValueT,
+        value_type: Type[metrics_api._ValueT],
         label_keys: Tuple[str, ...] = None,
         enabled: bool = True,
         monotonic: bool = True,
@@ -154,7 +157,7 @@ def __init__(
         name: str,
         description: str,
         unit: str,
-        value_type: metrics_api._ValueT,
+        value_type: Type[metrics_api._ValueT],
         label_keys: Tuple[str, ...] = None,
         enabled: bool = True,
         monotonic: bool = False,
@@ -184,7 +187,7 @@ def __init__(
         name: str,
         description: str,
         unit: str,
-        value_type: metrics_api._ValueT,
+        value_type: Type[metrics_api._ValueT],
         label_keys: Tuple[str, ...] = None,
         enabled: bool = False,
         monotonic: bool = False,
@@ -217,8 +220,8 @@ def create_metric(
         name: str,
         description: str,
         unit: str,
-        value_type: metrics_api._ValueT,
-        metric_type: metrics_api._MetricT,
+        value_type: Type[metrics_api._ValueT],
+        metric_type: Type[metrics_api._MetricT],
         label_keys: Tuple[str, ...] = None,
         enabled: bool = True,
         monotonic: bool = False,