Removed azmon env vars

Author: jeremydvoss

azure-monitor-opentelemetry/README.md

@@ -60,7 +60,7 @@ You can use `configure_azure_monitor` to set up instrumentation for your app to
 | `disable_logging` | If set to `True`, disables collection and export of logging telemetry. Defaults to `False`. | |
 | `disable_metrics` | If set to `True`, disables collection and export of metric telemetry. Defaults to `False`. | |
 | `disable_tracing` | If set to `True`, disables collection and export of distributed tracing telemetry. Defaults to `False`. | |
-| `logging_level` | Specifies the [logging level][logging_level] of the logs you would like to collect for your logging pipeline. In order to utilize the `OTEL_LOG_LEVEL` environment variable, set it to the number that represents the log leval, not a string representing that log level's name. For example, set to `30` for `logging.WARN`. Defaults to 0 which is `logging.NOTSET`. | `OTEL_LOG_LEVEL` |
+| `logging_level` | Specifies the [logging level][logging_level] of the logs you would like to collect for your logging pipeline. Defaults to 0 which is `logging.NOTSET`. | |
 | `logger_name` | Specifies the [logger name][logger_name_hierarchy_doc] under which logging will be instrumented. Defaults to "" which corresponds to the root logger. | |
 | `logging_export_interval_ms`| Specifies the logging export interval in milliseconds. Defaults to 5000. | `OTEL_BLRP_SCHEDULE_DELAY` |
 | `metric_readers` | Specifies the [metric readers][ot_metric_reader] that you would like to use for your metric pipeline. Accepts a list of [metric readers][ot_sdk_python_metric_reader]. | |

azure-monitor-opentelemetry/azure/monitor/opentelemetry/util/configurations.py

@@ -4,7 +4,6 @@
 # license information.
 # --------------------------------------------------------------------------
 
-from json import loads
 from logging import NOTSET, getLogger
 from os import environ
 from typing import Dict
@@ -24,35 +23,15 @@
     VIEWS_ARG,
 )
 from azure.monitor.opentelemetry._types import ConfigurationValue
-from opentelemetry.sdk.environment_variables import (
-    OTEL_LOG_LEVEL,
-    OTEL_TRACES_SAMPLER_ARG,
-)
+from opentelemetry.sdk.environment_variables import OTEL_TRACES_SAMPLER_ARG
 
-_CONFIGURATION_ENV_VAR_PREFIX = "APPLICATIONINSIGHTS_"
-_INVALID_JSON_MESSAGE = "Value of %s must be valid JSON. Defaulting to %s: %s"
-_INVALID_INT_MESSAGE = "Value of %s must be an integer. Defaulting to %s: %s"
 _INVALID_FLOAT_MESSAGE = "Value of %s must be a float. Defaulting to %s: %s"
 
 
-def _get_env_var_name(arg):
-    return _CONFIGURATION_ENV_VAR_PREFIX + arg.upper()
-
-
-EXCLUDE_INSTRUMENTATIONS_ENV_VAR = _get_env_var_name(
-    EXCLUDE_INSTRUMENTATIONS_ARG
-)
-DISABLE_LOGGING_ENV_VAR = _get_env_var_name(DISABLE_LOGGING_ARG)
-DISABLE_METRICS_ENV_VAR = _get_env_var_name(DISABLE_METRICS_ARG)
-DISABLE_TRACING_ENV_VAR = _get_env_var_name(DISABLE_TRACING_ARG)
-# Speced out but unused by OTel SDK as of 1.15.0
-LOGGING_LEVEL_ENV_VAR = OTEL_LOG_LEVEL
-LOGGER_NAME_ENV_VAR = _get_env_var_name(LOGGER_NAME_ARG)
 # Speced out but unused by OTel SDK as of 1.15.0
 LOGGING_EXPORT_INTERVAL_MS_ENV_VAR = "OTEL_BLRP_SCHEDULE_DELAY"
 # TODO: remove when sampler uses env var instead
 SAMPLING_RATIO_ENV_VAR = OTEL_TRACES_SAMPLER_ARG
-INSTRUMENTATION_CONFIG_ENV_VAR = _get_env_var_name(INSTRUMENTATION_CONFIG_ARG)
 
 
 _logger = getLogger(__name__)
@@ -88,82 +67,37 @@ def _get_configurations(**kwargs) -> Dict[str, ConfigurationValue]:
 
 def _default_exclude_instrumentations(configurations):
     if EXCLUDE_INSTRUMENTATIONS_ARG not in configurations:
-        default = []
-        if EXCLUDE_INSTRUMENTATIONS_ENV_VAR in environ:
-            try:
-                default = loads(environ[EXCLUDE_INSTRUMENTATIONS_ENV_VAR])
-            except ValueError as e:
-                _logger.error(
-                    _INVALID_JSON_MESSAGE
-                    % (EXCLUDE_INSTRUMENTATIONS_ENV_VAR, default, e)
-                )
-        configurations[EXCLUDE_INSTRUMENTATIONS_ARG] = default
+        configurations[EXCLUDE_INSTRUMENTATIONS_ARG] = []
 
 
 def _default_disable_logging(configurations):
     if DISABLE_LOGGING_ARG not in configurations:
-        default = False
-        if DISABLE_LOGGING_ENV_VAR in environ:
-            env_var = environ[DISABLE_LOGGING_ENV_VAR]
-            if env_var.lower() == "true":
-                default = True
-        configurations[DISABLE_LOGGING_ARG] = default
+        configurations[DISABLE_LOGGING_ARG] = False
 
 
 def _default_disable_metrics(configurations):
     if DISABLE_METRICS_ARG not in configurations:
-        default = False
-        if DISABLE_METRICS_ENV_VAR in environ:
-            env_var = environ[DISABLE_METRICS_ENV_VAR]
-            if env_var.lower() == "true":
-                default = True
-        configurations[DISABLE_METRICS_ARG] = default
+        configurations[DISABLE_METRICS_ARG] = False
 
 
 def _default_disable_tracing(configurations):
     if DISABLE_TRACING_ARG not in configurations:
-        default = False
-        if DISABLE_TRACING_ENV_VAR in environ:
-            env_var = environ[DISABLE_TRACING_ENV_VAR]
-            if env_var.lower() == "true":
-                default = True
-        configurations[DISABLE_TRACING_ARG] = default
+        configurations[DISABLE_TRACING_ARG] = False
 
 
 def _default_logging_level(configurations):
     if LOGGING_LEVEL_ARG not in configurations:
-        default = NOTSET
-        if LOGGING_LEVEL_ENV_VAR in environ:
-            # TODO: Match OTel env var usage when it is determined.
-            try:
-                default = int(environ[LOGGING_LEVEL_ENV_VAR])
-            except ValueError as e:
-                _logger.error(
-                    _INVALID_INT_MESSAGE % (LOGGING_LEVEL_ENV_VAR, default, e)
-                )
-        configurations[LOGGING_LEVEL_ARG] = default
+        configurations[LOGGING_LEVEL_ARG] = NOTSET
 
 
 def _default_logger_name(configurations):
     if LOGGER_NAME_ARG not in configurations:
-        default = ""
-        if LOGGER_NAME_ENV_VAR in environ:
-            default = environ[LOGGER_NAME_ENV_VAR]
-        configurations[LOGGER_NAME_ARG] = default
+        configurations[LOGGER_NAME_ARG] = ""
 
 
 def _default_logging_export_interval_ms(configurations):
     if LOGGING_EXPORT_INTERVAL_MS_ARG not in configurations:
-        default = 5000
-        if LOGGING_EXPORT_INTERVAL_MS_ENV_VAR in environ:
-            try:
-                default = int(environ[LOGGING_EXPORT_INTERVAL_MS_ENV_VAR])
-            except ValueError as e:
-                _logger.error(
-                    _INVALID_INT_MESSAGE
-                    % (LOGGING_EXPORT_INTERVAL_MS_ENV_VAR, default, e)
-                )
-        configurations[LOGGING_EXPORT_INTERVAL_MS_ARG] = default
+        configurations[LOGGING_EXPORT_INTERVAL_MS_ARG] = 5000
 
 
 def _default_metric_readers(configurations):
@@ -198,13 +132,4 @@ def _default_tracing_export_interval_ms(configurations):
 
 def _default_instrumentation_config(configurations):
     if INSTRUMENTATION_CONFIG_ARG not in configurations:
-        default = {}
-        if INSTRUMENTATION_CONFIG_ENV_VAR in environ:
-            try:
-                default = loads(environ[INSTRUMENTATION_CONFIG_ENV_VAR])
-            except ValueError as e:
-                _logger.error(
-                    _INVALID_JSON_MESSAGE
-                    % (INSTRUMENTATION_CONFIG_ENV_VAR, default, e)
-                )
-        configurations[INSTRUMENTATION_CONFIG_ARG] = default
+        configurations[INSTRUMENTATION_CONFIG_ARG] = {}

azure-monitor-opentelemetry/tests/configuration/test_util.py

@@ -12,19 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from logging import NOTSET, WARN
+from logging import NOTSET
 from unittest import TestCase
 from unittest.mock import patch
 
 from azure.monitor.opentelemetry.util.configurations import (
-    DISABLE_LOGGING_ENV_VAR,
-    DISABLE_METRICS_ENV_VAR,
-    DISABLE_TRACING_ENV_VAR,
-    EXCLUDE_INSTRUMENTATIONS_ENV_VAR,
-    INSTRUMENTATION_CONFIG_ENV_VAR,
-    LOGGER_NAME_ENV_VAR,
     LOGGING_EXPORT_INTERVAL_MS_ENV_VAR,
-    LOGGING_LEVEL_ENV_VAR,
     SAMPLING_RATIO_ENV_VAR,
     _get_configurations,
 )
@@ -109,63 +102,14 @@ def test_get_configurations_validation(self):
     @patch.dict(
         "os.environ",
         {
-            EXCLUDE_INSTRUMENTATIONS_ENV_VAR: '["flask"]',
-            DISABLE_LOGGING_ENV_VAR: "True",
-            DISABLE_METRICS_ENV_VAR: "True",
-            DISABLE_TRACING_ENV_VAR: "True",
-            LOGGING_LEVEL_ENV_VAR: "30",
-            LOGGER_NAME_ENV_VAR: "opentelemetry",
             LOGGING_EXPORT_INTERVAL_MS_ENV_VAR: "10000",
             SAMPLING_RATIO_ENV_VAR: "0.5",
-            INSTRUMENTATION_CONFIG_ENV_VAR: """{
-                "flask": {
-                    "excluded_urls": "http://localhost:8080/ignore"
-                }
-            }""",
         },
         clear=True,
     )
     def test_get_configurations_env_vars(self):
         configurations = _get_configurations()
 
-        self.assertTrue("connection_string" not in configurations)
-        self.assertEqual(configurations["exclude_instrumentations"], ["flask"])
-        self.assertEqual(configurations["disable_logging"], True)
-        self.assertEqual(configurations["disable_metrics"], True)
-        self.assertEqual(configurations["disable_tracing"], True)
-        self.assertEqual(configurations["logging_level"], WARN)
-        self.assertEqual(configurations["logger_name"], "opentelemetry")
-        self.assertTrue("resource" not in configurations)
-        self.assertEqual(configurations["sampling_ratio"], 0.5)
-        self.assertEqual(configurations["tracing_export_interval_ms"], None)
-        self.assertEqual(configurations["logging_export_interval_ms"], 10000)
-        self.assertEqual(configurations["metric_readers"], [])
-        self.assertEqual(configurations["views"], ())
-        self.assertEqual(
-            configurations["instrumentation_config"],
-            {"flask": {"excluded_urls": "http://localhost:8080/ignore"}},
-        )
-
-    @patch.dict(
-        "os.environ",
-        {
-            EXCLUDE_INSTRUMENTATIONS_ENV_VAR: '"flask',
-            DISABLE_LOGGING_ENV_VAR: "one",
-            DISABLE_METRICS_ENV_VAR: "",
-            DISABLE_TRACING_ENV_VAR: "0.5",
-            LOGGING_LEVEL_ENV_VAR: "Thirty",
-            LOGGING_EXPORT_INTERVAL_MS_ENV_VAR: "Ten Thousand",
-            SAMPLING_RATIO_ENV_VAR: "Half",
-            INSTRUMENTATION_CONFIG_ENV_VAR: """{
-                "flask":
-                    "excluded_urls": "http://localhost:8080/ignore"
-            }""",
-        },
-        clear=True,
-    )
-    def test_get_configurations_env_vars_validation(self):
-        configurations = _get_configurations()
-
         self.assertTrue("connection_string" not in configurations)
         self.assertEqual(configurations["exclude_instrumentations"], [])
         self.assertEqual(configurations["disable_logging"], False)
@@ -174,7 +118,7 @@ def test_get_configurations_env_vars_validation(self):
         self.assertEqual(configurations["logging_level"], NOTSET)
         self.assertEqual(configurations["logger_name"], "")
         self.assertTrue("resource" not in configurations)
-        self.assertEqual(configurations["sampling_ratio"], 1.0)
+        self.assertEqual(configurations["sampling_ratio"], 0.5)
         self.assertEqual(configurations["tracing_export_interval_ms"], None)
         self.assertEqual(configurations["logging_export_interval_ms"], 5000)
         self.assertEqual(configurations["metric_readers"], [])
@@ -184,13 +128,12 @@ def test_get_configurations_env_vars_validation(self):
     @patch.dict(
         "os.environ",
         {
-            DISABLE_LOGGING_ENV_VAR: "false",
-            DISABLE_METRICS_ENV_VAR: "False",
-            DISABLE_TRACING_ENV_VAR: "FALSE",
+            LOGGING_EXPORT_INTERVAL_MS_ENV_VAR: "Ten Thousand",
+            SAMPLING_RATIO_ENV_VAR: "Half",
         },
         clear=True,
     )
-    def test_get_configurations_env_vars_false(self):
+    def test_get_configurations_env_vars_validation(self):
         configurations = _get_configurations()
 
         self.assertTrue("connection_string" not in configurations)
@@ -207,30 +150,3 @@ def test_get_configurations_env_vars_false(self):
         self.assertEqual(configurations["metric_readers"], [])
         self.assertEqual(configurations["views"], ())
         self.assertEqual(configurations["instrumentation_config"], {})
-
-    @patch.dict(
-        "os.environ",
-        {
-            DISABLE_LOGGING_ENV_VAR: "true",
-            DISABLE_METRICS_ENV_VAR: "True",
-            DISABLE_TRACING_ENV_VAR: "TRUE",
-        },
-        clear=True,
-    )
-    def test_get_configurations_env_vars_true(self):
-        configurations = _get_configurations()
-
-        self.assertTrue("connection_string" not in configurations)
-        self.assertEqual(configurations["exclude_instrumentations"], [])
-        self.assertEqual(configurations["disable_logging"], True)
-        self.assertEqual(configurations["disable_metrics"], True)
-        self.assertEqual(configurations["disable_tracing"], True)
-        self.assertEqual(configurations["logging_level"], NOTSET)
-        self.assertEqual(configurations["logger_name"], "")
-        self.assertTrue("resource" not in configurations)
-        self.assertEqual(configurations["sampling_ratio"], 1.0)
-        self.assertEqual(configurations["tracing_export_interval_ms"], None)
-        self.assertEqual(configurations["logging_export_interval_ms"], 5000)
-        self.assertEqual(configurations["metric_readers"], [])
-        self.assertEqual(configurations["views"], ())
-        self.assertEqual(configurations["instrumentation_config"], {})