Remove deprecated configs from tests and documentation (#2665)

* remove deprecated configs from tests and documentation

* add tests

* lint

Co-authored-by: Kyle Verhoog <[email protected]>

Author: mabdinur

docs/advanced_usage.rst

@@ -622,7 +622,7 @@ sure your application has a route to the tracing Agent. An easy way to test
 this is with a::
 
 $ pip install ipython
-$ DATADOG_TRACE_DEBUG=true ddtrace-run ipython
+$ DD_TRACE_DEBUG=true ddtrace-run ipython
 
 Because iPython uses SQLite, it will be automatically instrumented and your
 traces should be sent off. If an error occurs, a message will be displayed in

tests/commands/test_runner.py

@@ -86,8 +86,24 @@ def test_integration(self):
 
     def test_debug_enabling(self):
         """
-        {DD,DATADOG}_TRACE_DEBUG=true allows setting debug logging of the global tracer
+        DD_TRACE_DEBUG=true allows setting debug logging of the global tracer.
+        Test DATADOG_TRACE_DEBUG flag for backwards compatibility
         """
+        with self.override_env(dict(DD_TRACE_DEBUG="false")):
+            out = subprocess.check_output(
+                ["ddtrace-run", "python", "tests/commands/ddtrace_run_no_debug.py"], stderr=subprocess.STDOUT
+            )
+            assert b"Test success" in out
+            assert b"DATADOG TRACER CONFIGURATION" not in out
+
+        with self.override_env(dict(DD_TRACE_DEBUG="true")):
+            out = subprocess.check_output(
+                ["ddtrace-run", "python", "tests/commands/ddtrace_run_debug.py"],
+                stderr=subprocess.STDOUT,
+            )
+            assert b"Test success" in out
+            assert b"DATADOG TRACER CONFIGURATION" in out
+
         with self.override_env(dict(DATADOG_TRACE_DEBUG="false")):
             out = subprocess.check_output(
                 ["ddtrace-run", "python", "tests/commands/ddtrace_run_no_debug.py"], stderr=subprocess.STDOUT

tests/integration/test_debug.py

@@ -310,7 +310,7 @@ def test_different_samplers():
 def test_error_output_ddtracerun_debug_mode():
     p = subprocess.Popen(
         ["ddtrace-run", "python", "tests/integration/hello.py"],
-        env=dict(DD_TRACE_AGENT_URL="http://localhost:8126", DATADOG_TRACE_DEBUG="true", **os.environ),
+        env=dict(DD_TRACE_AGENT_URL="http://localhost:8126", DD_TRACE_DEBUG="true", **os.environ),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
@@ -322,7 +322,7 @@ def test_error_output_ddtracerun_debug_mode():
     # No connection to agent, debug mode enabled
     p = subprocess.Popen(
         ["ddtrace-run", "python", "tests/integration/hello.py"],
-        env=dict(DD_TRACE_AGENT_URL="http://localhost:4321", DATADOG_TRACE_DEBUG="true", **os.environ),
+        env=dict(DD_TRACE_AGENT_URL="http://localhost:4321", DD_TRACE_DEBUG="true", **os.environ),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
@@ -337,7 +337,7 @@ def test_error_output_ddtracerun():
     # Connection to agent, debug mode disabled
     p = subprocess.Popen(
         ["ddtrace-run", "python", "tests/integration/hello.py"],
-        env=dict(DD_TRACE_AGENT_URL="http://localhost:8126", DATADOG_TRACE_DEBUG="false", **os.environ),
+        env=dict(DD_TRACE_AGENT_URL="http://localhost:8126", DD_TRACE_DEBUG="false", **os.environ),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
@@ -350,7 +350,7 @@ def test_error_output_ddtracerun():
     # No connection to agent, debug mode disabled
     p = subprocess.Popen(
         ["ddtrace-run", "python", "tests/integration/hello.py"],
-        env=dict(DD_TRACE_AGENT_URL="http://localhost:4321", DATADOG_TRACE_DEBUG="false", **os.environ),
+        env=dict(DD_TRACE_AGENT_URL="http://localhost:4321", DD_TRACE_DEBUG="false", **os.environ),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )

tests/utils.py

@@ -54,7 +54,7 @@ def override_env(env):
     """
     Temporarily override ``os.environ`` with provided values::
 
-        >>> with self.override_env(dict(DATADOG_TRACE_DEBUG=True)):
+        >>> with self.override_env(dict(DD_TRACE_DEBUG=True)):
             # Your test
     """
     # Copy the full original environment