Implement "named" meters + Remove "Batcher" from Meter constructor

README.md

@@ -74,7 +74,7 @@ from opentelemetry.sdk.metrics import Counter, MeterProvider
 from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter
 from opentelemetry.sdk.metrics.export.controller import PushController
 
-metrics.set_preferred_meter_source_implementation(lambda _: MeterProvider())
+metrics.set_preferred_meter_provider_implementation(lambda _: MeterProvider())
 meter = metrics.get_meter(__name__)
 exporter = ConsoleMetricsExporter()
 controller = PushController(meter, exporter, 5)

examples/metrics/record.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

examples/metrics/simple_example.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

ext/opentelemetry-ext-flask/tests/test_flask_integration.py

@@ -78,7 +78,10 @@ def assert_environ():
 
     def test_simple(self):
         expected_attrs = expected_attributes(
-            {"http.target": "/hello/123", "http.route": "/hello/<int:helloid>"}
+            {
+                "http.target": "/hello/123",
+                "http.route": "/hello/<int:helloid>",
+            }
         )
         resp = self.client.get("/hello/123")
         self.assertEqual(200, resp.status_code)

opentelemetry-api/src/opentelemetry/context/threadlocal_context.py

@@ -41,7 +41,9 @@ def attach(self, context: Context) -> object:
     def get_current(self) -> Context:
         """See `opentelemetry.context.RuntimeContext.get_current`."""
         if not hasattr(self._current_context, self._CONTEXT_KEY):
-            setattr(self._current_context, self._CONTEXT_KEY, Context())
+            setattr(
+                self._current_context, self._CONTEXT_KEY, Context(),
+            )
         context = getattr(
             self._current_context, self._CONTEXT_KEY
         )  # type: Context

opentelemetry-api/src/opentelemetry/metrics/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -379,8 +379,8 @@ def get_label_set(self, labels: Dict[str, str]) -> "LabelSet":
     [Type[MeterProvider]], Optional[MeterProvider]
 ]
 
-_METER_SOURCE = None
-_METER_SOURCE_FACTORY = None
+_METER_PROVIDER = None
+_METER_PROVIDER_FACTORY = None
 
 
 def get_meter(
@@ -402,13 +402,13 @@ def meter_provider() -> MeterProvider:
 
     If there isn't one set yet, a default will be loaded.
     """
-    global _METER_SOURCE, _METER_SOURCE_FACTORY  # pylint:disable=global-statement
+    global _METER_PROVIDER, _METER_PROVIDER_FACTORY  # pylint:disable=global-statement
 
-    if _METER_SOURCE is None:
+    if _METER_PROVIDER is None:
         # pylint:disable=protected-access
         try:
-            _METER_SOURCE = loader._load_impl(
-                MeterProvider, _METER_SOURCE_FACTORY  # type: ignore
+            _METER_PROVIDER = loader._load_impl(
+                MeterProvider, _METER_PROVIDER_FACTORY  # type: ignore
             )
         except TypeError:
             # if we raised an exception trying to instantiate an
@@ -417,10 +417,10 @@ def meter_provider() -> MeterProvider:
                 "Unable to instantiate MeterProvider from meter provider factory.",
                 exc_info=True,
             )
-            _METER_SOURCE = DefaultMeterProvider()
-        del _METER_SOURCE_FACTORY
+            _METER_PROVIDER = DefaultMeterProvider()
+        del _METER_PROVIDER_FACTORY
 
-    return _METER_SOURCE
+    return _METER_PROVIDER
 
 
 def set_preferred_meter_provider_implementation(
@@ -435,9 +435,9 @@ def set_preferred_meter_provider_implementation(
     Args:
         factory: Callback that should create a new :class:`MeterProvider` instance.
     """
-    global _METER_SOURCE_FACTORY  # pylint:disable=global-statement
+    global _METER_PROVIDER_FACTORY  # pylint:disable=global-statement
 
-    if _METER_SOURCE:
+    if _METER_PROVIDER:
         raise RuntimeError("MeterProvider already loaded.")
 
-    _METER_SOURCE_FACTORY = factory
+    _METER_PROVIDER_FACTORY = factory

opentelemetry-api/src/opentelemetry/util/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-api/tests/metrics/test_metrics.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-api/tests/test_implementation.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-api/tests/trace/test_sampling.py

@@ -235,4 +235,6 @@ def test_probability_sampler_limits(self):
         # Check that the higest effective sampling rate is actually lower than
         # the highest theoretical sampling rate. If this test fails the test
         # above is wrong.
-        self.assertLess(almost_almost_always_on.bound, 0xFFFFFFFFFFFFFFFF)
+        self.assertLess(
+            almost_almost_always_on.bound, 0xFFFFFFFFFFFFFFFF,
+        )

opentelemetry-sdk/src/opentelemetry/sdk/metrics/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -263,6 +263,7 @@ class Meter(metrics_api.Meter):
 
     Args:
         instrumentation_info: The `InstrumentationInfo` for this meter.
+        stateful: Indicates whether the meter is stateful.
     """
 
     def __init__(

opentelemetry-sdk/src/opentelemetry/sdk/util/instrumentation.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-sdk/tests/metrics/export/test_export.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-sdk/tests/metrics/test_implementation.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opentelemetry-sdk/tests/metrics/test_metrics.py

@@ -1,4 +1,4 @@
-# Copyright 2019, OpenTelemetry Authors
+# Copyright 2020, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.