Remove configuration file from manager

Author: ocelotl

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

@@ -25,10 +25,8 @@
 powerful one, Dynaconf, for example.
 """
 
-from json import load
 from logging import getLogger
 from os import environ
-from os.path import exists, expanduser, join
 
 from pkg_resources import iter_entry_points
 
@@ -47,18 +45,6 @@ def __new__(cls) -> "Configuration":
                 key: "default_{}".format(key) for key in cls.__slots__
             }
 
-            configuration_file_path = join(
-                expanduser("~"), ".config", "opentelemetry_python.json"
-            )
-
-            if exists(configuration_file_path):
-
-                with open(configuration_file_path) as configuration_file:
-                    file_configuration = load(configuration_file)
-
-                for key, value in configuration.items():
-                    configuration[key] = file_configuration.get(key, value)
-
             for key, value in configuration.items():
                 configuration[key] = environ.get(
                     "OPENTELEMETRY_PYTHON_{}".format(key.upper()), value

opentelemetry-api/src/opentelemetry/configuration/opentelemetry_python.json

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from json import dumps
-from os import getcwd
 from unittest import TestCase
 from unittest.mock import patch
 
@@ -87,25 +86,6 @@ def test_default_values(  # type: ignore
             Configuration().meter_provider, "default_meter_provider"
         )  # pylint: disable=no-member
 
-    @patch(
-        "opentelemetry.configuration.iter_entry_points",
-        **{"side_effect": IterEntryPointsMock}  # type: ignore
-    )
-    @patch("opentelemetry.configuration.expanduser")
-    def test_configuration_file(  # type: ignore
-        self,
-        mock_expanduser,
-        mock_iter_entry_points,  # pylint: disable=unused-argument
-    ):  # type: ignore
-        mock_expanduser.return_value = getcwd()
-
-        self.assertEqual(
-            Configuration().tracer_provider, "overridden_tracer_provider"
-        )  # pylint: disable=no-member
-        self.assertEqual(
-            Configuration().meter_provider, "default_meter_provider"
-        )  # pylint: disable=no-member
-
     @patch(
         "opentelemetry.configuration.iter_entry_points",
         **{"side_effect": IterEntryPointsMock}  # type: ignore
@@ -124,33 +104,6 @@ def test_environment_variables(  # type: ignore
             Configuration().meter_provider, "overridden_meter_provider"
         )  # pylint: disable=no-member
 
-    @patch(
-        "opentelemetry.configuration.iter_entry_points",
-        **{"side_effect": IterEntryPointsMock}  # type: ignore
-    )
-    @patch("opentelemetry.configuration.expanduser")
-    @patch.dict(
-        "os.environ",
-        {
-            "OPENTELEMETRY_PYTHON_TRACER_PROVIDER": (
-                "reoverridden_tracer_provider"
-            )
-        },
-    )
-    def test_configuration_file_environment_variables(  # type: ignore
-        self,
-        mock_expanduser,
-        mock_iter_entry_points,  # pylint: disable=unused-argument
-    ):  # type: ignore
-        mock_expanduser.return_value = getcwd()
-
-        self.assertEqual(
-            Configuration().tracer_provider, "reoverridden_tracer_provider"
-        )
-        self.assertEqual(
-            Configuration().meter_provider, "default_meter_provider"
-        )
-
     def test_property(self):
         with self.assertRaises(AttributeError):
             Configuration().tracer_provider = "new_tracer_provider"

opentelemetry-api/tests/configuration/test_configuration.py

@@ -19,22 +19,15 @@
 """
 
 import json
-from os import environ
 
 import flask
 import requests
 
 # FIXME This could likely be avoided by integrating this script into the
 # standard test running mechanisms.
 
-environ[
-    "OPENTELEMETRY_PYTHON_TRACER_PROVIDER"
-] = "sdk_tracer_provider"  # isort:skip
-environ[
-    "OPENTELEMETRY_PYTHON_METER_PROVIDER"
-] = "sdk_meter_provider"  # isort:skip
-
 from opentelemetry import trace  # noqa # isort:skip
+from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.ext import http_requests  # noqa # isort:skip"
 from opentelemetry.ext.wsgi import OpenTelemetryMiddleware  # noqa # isort:skip
 from opentelemetry.sdk.trace.export import (  # noqa # isort:skip
@@ -45,6 +38,7 @@
 # Integrations are the glue that binds the OpenTelemetry API and the
 # frameworks and libraries that are used together, automatically creating
 # Spans and propagating context as appropriate.
+trace.set_tracer_provider(TracerProvider())
 http_requests.enable(trace.get_tracer_provider())
 
 # SpanExporter receives the spans and send them to the target location.