[python-conprof] Upgrade to ddtrace 3.2.1 for Python 3.13

Author: sumerc

Diff for: blackfire_conprof/profiler.py

@@ -5,14 +5,9 @@
 from blackfire_conprof import log
 from .version import __version__
 
-from ddtrace.profiling import Profiler as DDProfiler
-log.bridge_ddtrace_logging()
-
 _DEFAULT_PERIOD = 45 # secs
 _DEFAULT_UPLOAD_TIMEOUT = 10 # secs
 
-logger = log.get_logger(__name__)
-
 def _get_default_agent_socket():
     plat = platform.system()
     if plat == 'Windows':
@@ -81,27 +76,33 @@ def __init__(self, application_name=None, agent_socket=None,
         os.environ["DD_PROFILING_UPLOAD_INTERVAL"] = str(period)
         os.environ["DD_PROFILING_API_TIMEOUT"] = str(upload_timeout)
         os.environ["DD_INSTRUMENTATION_TELEMETRY_ENABLED"] = "False"
+        os.environ["DD_TRACE_AGENT_URL"] = agent_socket
 
         api_key = ''
         if server_id and server_token:
             api_key = '%s:%s' % (server_id, server_token)
 
         # if application_name(service) is still None here, DD fills with the 
         # current running module name
+        from ddtrace.profiling import Profiler as DDProfiler
         self._profiler = DDProfiler(
             service=application_name,
             tags=labels,
-            url=agent_socket,
             api_key=api_key,
             enable_code_provenance=False,
         )
 
+        # needs to be done after DDProfiler import
+        log.bridge_ddtrace_logging()
+
+        self.logger = log.get_logger(__name__)
+
     def start(self, *args, **kwargs):
         self._profiler.start(*args, **kwargs)
 
-        logger.info("Started profiling")
+        self.logger.info("Started profiling")
 
     def stop(self):
         self._profiler.stop()
 
-        logger.info("Profiling stopped")
+        self.logger.info("Profiling stopped")

Diff for: setup.py

@@ -15,7 +15,7 @@
     author="Blackfire.io",
     packages=['blackfire_conprof', 'blackfire_conprof.bootstrap'],
     author_email="[email protected]",
-    install_requires=["ddtrace==2.9.1"],
+    install_requires=["ddtrace==3.2.1"],
     description="Blackfire Continuous Profiler",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -27,7 +27,6 @@
     url=HOMEPAGE,
     classifiers=[
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

Diff for: tests/test_profiler.py

@@ -2,6 +2,7 @@
 import time
 import os
 from blackfire_conprof.profiler import Profiler
+from ddtrace.settings.profiling import config as profiling_config
 
 from contextlib import contextmanager
 
@@ -33,6 +34,21 @@ def test_profiler_dd_envvars(self):
             # ensure os.environ is preserved
             self.assertEqual(os.environ['DD_PROFILING_ENABLED'], '1')
 
+    @unittest.skip(not profiling_config.export.libdd_enabled)
+    def test_profiler_basic_lib_dd(self):
+        class _context:
+            nexportcalls = 0
+        def _upload(*args, **kwargs):
+            _context.nexportcalls += 1
+
+        from ddtrace.internal.datadog.profiling import ddup as dd_ddup_exporter
+        with _patch(dd_ddup_exporter, "upload", _upload):
+            prof = Profiler(period=0.1)
+            prof.start()
+            prof.stop()
+        self.assertTrue(_context.nexportcalls >= 1)
+
+    @unittest.skip(profiling_config.export.libdd_enabled)
     def test_profiler_basic(self):
         def foo(t):
             time.sleep(t)
@@ -80,6 +96,7 @@ def test_profiler_params(self):
             self.assertTrue('probe_version' in prof._profiler.tags)
             self.assertTrue(prof._profiler.tags.get('project_id') == 'id-1')
 
+    @unittest.skip(profiling_config.export.libdd_enabled)
     def test_profiler_creds(self):
         def _upload(instance, client, path, body, headers):
             self.assertTrue(headers.get('DD-API-KEY').decode()=='id-1:token-1')