Store ints as ints in the configuration object (#1119)

Fixes #1118 Co-authored-by: alrex <aboten@lightstep.com>
open-telemetry · Sep 21, 2020 · 99e8971 · 99e8971
1 parent 7f01f05
commit 99e8971
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/opentelemetry-api/CHANGELOG.md b/opentelemetry-api/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Store `int`s as `int`s in the global Configuration object
+  ([#1118](https://github.com/open-telemetry/opentelemetry-python/pull/1118))
+
 ## Version 0.13b0
 
 Released 2020-09-17

diff --git a/opentelemetry-api/src/opentelemetry/configuration/__init__.py b/opentelemetry-api/src/opentelemetry/configuration/__init__.py
@@ -128,11 +128,10 @@ def __new__(cls) -> "Configuration":
                         try:
                             value = int(value_str)
                         except ValueError:
-                            pass
-                        try:
-                            value = float(value_str)
-                        except ValueError:
-                            pass
+                            try:
+                                value = float(value_str)
+                            except ValueError:
+                                pass
 
                     instance._config_map[key] = value
 

diff --git a/opentelemetry-api/tests/configuration/test_configuration.py b/opentelemetry-api/tests/configuration/test_configuration.py
@@ -119,15 +119,12 @@ def test_boolean(self) -> None:
         },
     )
     def test_integer(self) -> None:
-        self.assertEqual(
-            Configuration().POSITIVE_INTEGER, 123
-        )  # pylint: disable=no-member
-        self.assertEqual(
-            Configuration().NEGATIVE_INTEGER, -123
-        )  # pylint: disable=no-member
-        self.assertEqual(
-            Configuration().NON_INTEGER, "-12z3"
-        )  # pylint: disable=no-member
+        # pylint: disable=no-member
+        self.assertIsInstance(Configuration().POSITIVE_INTEGER, int)
+        self.assertEqual(Configuration().POSITIVE_INTEGER, 123)
+        self.assertIsInstance(Configuration().NEGATIVE_INTEGER, int)
+        self.assertEqual(Configuration().NEGATIVE_INTEGER, -123)
+        self.assertEqual(Configuration().NON_INTEGER, "-12z3")
 
     @patch.dict(
         "os.environ",  # type: ignore