Merge branch '1.17' into backport-6569-to-1.17

ddtrace/profiling/exporter/pprof.pyx

@@ -19,6 +19,7 @@ from ddtrace.profiling import recorder
 from ddtrace.profiling.collector import _lock
 from ddtrace.profiling.collector import memalloc
 from ddtrace.profiling.collector import stack_event
+from ddtrace.profiling.collector import threading
 
 
 if hasattr(typing, "TypedDict"):
@@ -99,7 +100,7 @@ _pb_version = _protobuf_version()
 for v in [(4, 21), (3, 19), (3, 12)]:
     if _pb_version >= v:
         import sys
-        
+
         pprof_module = "ddtrace.profiling.exporter.pprof_%s%s_pb2" % v
         __import__(pprof_module)
         pprof_pb2 = sys.modules[pprof_module]
@@ -687,6 +688,8 @@ class PprofExporter(exporter.Exporter):
         for event_class, convert_fn in (
             (_lock.LockAcquireEvent, converter.convert_lock_acquire_event),
             (_lock.LockReleaseEvent, converter.convert_lock_release_event),
+            (threading.ThreadingLockAcquireEvent, converter.convert_lock_acquire_event),
+            (threading.ThreadingLockReleaseEvent, converter.convert_lock_release_event),
         ):
             lock_events = events.get(event_class, [])  # type: ignore[call-overload]
             sampling_sum_pct = sum(event.sampling_pct for event in lock_events)