chore: remove deprecated items

ddtrace/internal/remoteconfig/utils.py

@@ -1,5 +1,3 @@
-import os
-
 from ddtrace import config
 
 

ddtrace/settings/config.py

@@ -354,18 +354,9 @@ def __init__(self):
  except (TypeError, ValueError):
  pass
 
- if "DD_TRACE_OBFUSCATION_QUERY_STRING_PATTERN" in os.environ:
- deprecate(
- "`DD_TRACE_OBFUSCATION_QUERY_STRING_PATTERN` is deprecated "
- "and will be removed in the next major version.",
- message="use `DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP` instead",
- removal_version="2.0.0",
- )
- dd_trace_obfuscation_query_string_regexp = os.getenv("DD_TRACE_OBFUSCATION_QUERY_STRING_PATTERN")
- else:
- dd_trace_obfuscation_query_string_regexp = os.getenv(
- "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP", DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP_DEFAULT
- )
+ dd_trace_obfuscation_query_string_regexp = os.getenv(
+ "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP", DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP_DEFAULT
+ )
  self.global_query_string_obfuscation_disabled = True # If empty obfuscation pattern
  self._obfuscation_query_string_pattern = None
  self.http_tag_query_string = True # Default behaviour of query string tagging in http.url

releasenotes/notes/release-2.0-3af0045e2261bd02.yaml

@@ -67,6 +67,9 @@ prelude: >
  * - ``DD_CALL_BASIC_CONFIG``
  - None
  - :ref:`📝<remove-basic-config>`
+ * - ``DD_TRACE_OBFUSCATION_QUERY_STRING_PATERN``
+ - ``DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP``
+ - :ref:`📝<remove-trace-obfuscation-query-string-pattern>`
 
 
  .. _removed-2.0-tracing-interfaces:

releasenotes/notes/remove-deprecated-items-2.0-89eac06472c59554.yaml

@@ -107,4 +107,12 @@ upgrade:
  The ddtrace logger will log to stdout by default or additionally to a file specified by ``DD_TRACE_LOG_FILE``.
 
 
+ "
+ - ".. _remove-trace-obfuscation-query-string-pattern:
+
+
+ ``DD_TRACE_OBFUSCATION_QUERY_STRING_PATTERN`` is removed.
+ Use ``DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP`` instead.
+
+
  "

tests/internal/remoteconfig/test_remoteconfig.py

@@ -21,7 +21,6 @@
 from ddtrace.internal.remoteconfig.worker import remoteconfig_poller
 from ddtrace.internal.service import ServiceStatus
 from tests.internal.test_utils_version import _assert_and_get_version_agent_format
-from tests.utils import override_env
 from tests.utils import override_global_config