accept both cases of PROMETHEUS_MULTIPROC_DIR

Signed-off-by: iostream96 <[email protected]>

Author: iostream96

prometheus_client/utils.py

@@ -28,7 +28,4 @@ def floatToGoString(d):
 
 
 def _getMultiprocDir() -> str:
-    if 'prometheus_multiproc_dir' in os.environ and 'PROMETHEUS_MULTIPROC_DIR' not in os.environ:
-        os.environ['PROMETHEUS_MULTIPROC_DIR'] = os.environ['prometheus_multiproc_dir']
-        warnings.warn("prometheus_multiproc_dir variable has been deprecated in favor of the upper case naming PROMETHEUS_MULTIPROC_DIR", DeprecationWarning)
-    return os.environ.get('PROMETHEUS_MULTIPROC_DIR', '')
+    return os.environ.get('PROMETHEUS_MULTIPROC_DIR', '') or os.environ.get('prometheus_multiproc_dir', '')

tests/test_multiprocess.py

@@ -17,7 +17,7 @@
 )
 
 
-class TestMultiProcessDeprecation(unittest.TestCase):
+class TestMultiProcessLowercase(unittest.TestCase):
     def setUp(self):
         self.tempdir = tempfile.mkdtemp()
 
@@ -27,19 +27,6 @@ def tearDown(self):
         values.ValueClass = MutexValue
         shutil.rmtree(self.tempdir)
 
-    def test_deprecation_warning(self):
-        os.environ['prometheus_multiproc_dir'] = self.tempdir
-        with warnings.catch_warnings(record=True) as w:
-            values.ValueClass = get_value_class()
-            registry = CollectorRegistry()
-            collector = MultiProcessCollector(registry)
-            Counter('c', 'help', registry=None)
-
-            assert os.environ['PROMETHEUS_MULTIPROC_DIR'] == self.tempdir
-            assert len(w) == 1
-            assert issubclass(w[-1].category, DeprecationWarning)
-            assert "PROMETHEUS_MULTIPROC_DIR" in str(w[-1].message)
-
     def test_mark_process_dead_respects_lowercase(self):
         os.environ['prometheus_multiproc_dir'] = self.tempdir
         # Just test that this does not raise with a lowercase env var. The