Promote some PendingDeprecationWarning to DeprecationWarning

elasticapm/contrib/django/handlers.py

@@ -47,11 +47,11 @@
 class LoggingHandler(BaseLoggingHandler):
     def __init__(self, level=logging.NOTSET) -> None:
         warnings.warn(
-            "The LoggingHandler will be deprecated in v7.0 of the agent. "
+            "The LoggingHandler is deprecated and will be removed in v7.0 of the agent. "
             "Please use `log_ecs_reformatting` and ship the logs with Elastic "
             "Agent or Filebeat instead. "
             "https://www.elastic.co/guide/en/apm/agent/python/current/logs.html",
-            PendingDeprecationWarning,
+            DeprecationWarning,
         )
         # skip initialization of BaseLoggingHandler
         logging.Handler.__init__(self, level=level)

elasticapm/contrib/flask/__init__.py

@@ -87,7 +87,7 @@ def __init__(self, app=None, client=None, client_cls=Client, logging=False, **de
         if self.logging:
             warnings.warn(
                 "Flask log shipping is deprecated. See the Flask docs for more info and alternatives.",
-                PendingDeprecationWarning,
+                DeprecationWarning,
             )
         self.client = client or get_client()
         self.client_cls = client_cls

elasticapm/contrib/opentracing/__init__.py

@@ -36,8 +36,8 @@
 
 warnings.warn(
     (
-        "The OpenTracing bridge will be deprecated in the next major release. "
+        "The OpenTracing bridge is deprecated and will be removed in the next major release. "
         "Please migrate to the OpenTelemetry bridge."
     ),
-    PendingDeprecationWarning,
+    DeprecationWarning,
 )

elasticapm/handlers/logging.py

@@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs) -> None:
             "the agent. Please use `log_ecs_reformatting` and ship the logs "
             "with Elastic Agent or Filebeat instead. "
             "https://www.elastic.co/guide/en/apm/agent/python/current/logs.html",
-            PendingDeprecationWarning,
+            DeprecationWarning,
         )
         self.client = None
         if "client" in kwargs:
@@ -66,12 +66,9 @@ def __init__(self, *args, **kwargs) -> None:
             if client_cls:
                 self.client = client_cls(*args, **kwargs)
             else:
-                # In 6.0, this should raise a ValueError
                 warnings.warn(
-                    "LoggingHandler requires a Client instance. No Client was "
-                    "received. This will result in an error starting in v6.0 "
-                    "of the agent",
-                    PendingDeprecationWarning,
+                    "LoggingHandler requires a Client instance. No Client was received.",
+                    DeprecationWarning,
                 )
                 self.client = Client(*args, **kwargs)
         logging.Handler.__init__(self, level=kwargs.get("level", logging.NOTSET))
@@ -201,7 +198,7 @@ def __init__(self, name=""):
             "the agent. On Python 3.2+, by default we add a LogRecordFactory to "
             "your root logger automatically"
             "https://www.elastic.co/guide/en/apm/agent/python/current/logs.html",
-            PendingDeprecationWarning,
+            DeprecationWarning,
         )
 
     def filter(self, record):

tests/handlers/logging/logging_tests.py

@@ -380,7 +380,7 @@ def test_logging_handler_no_client(recwarn):
     while True:
         # If we never find our desired warning this will eventually throw an
         # AssertionError
-        w = recwarn.pop(PendingDeprecationWarning)
+        w = recwarn.pop(DeprecationWarning)
         if "LoggingHandler requires a Client instance" in w.message.args[0]:
             return True