Delay lock creation

datadog/__init__.py

@@ -15,6 +15,7 @@
 import os
 import os.path
 from typing import Any, List, Optional
+from threading import Lock
 
 # datadog
 from datadog import api
@@ -122,6 +123,8 @@ def initialize(
     if statsd_constant_tags:
         statsd.constant_tags += statsd_constant_tags
 
+    statsd.lock = Lock()
+
     api._return_raw_response = return_raw_response
 
     # HTTP client and API options

datadog/dogstatsd/base.py

@@ -13,7 +13,6 @@
 import socket
 import errno
 import time
-from threading import Lock
 
 # datadog
 from datadog.dogstatsd.context import (
@@ -52,6 +51,18 @@
 DEFAULT_TELEMETRY_MIN_FLUSH_INTERVAL = 10
 
 
+class _NullContextManager(object):
+
+    def __init__(self):
+        pass
+
+    def __enter__(self):
+        pass
+
+    def __exit__(self, *args):
+        pass
+
+
 class DogStatsd(object):
     OK, WARNING, CRITICAL, UNKNOWN = (0, 1, 2, 3)
 
@@ -170,7 +181,8 @@ def __init__(
         :type telemetry_socket_path: string
         """
 
-        self.lock = Lock()
+        # Create the lock later in initialize
+        self.lock = None
 
         # Check for deprecated option
         if max_buffer_size is not None:
@@ -298,7 +310,10 @@ def get_socket(self, telemetry=False):
         Note: connect the socket before assigning it to the class instance to
         avoid bad thread race conditions.
         """
-        with self.lock:
+        lock = self.lock
+        if lock is None:
+            lock = _NullContextManager()
+        with lock:
             if telemetry and self._dedicated_telemetry_destination():
                 if not self.telemetry_socket:
                     if self.telemetry_socket_path is not None:
@@ -493,7 +508,10 @@ def close_socket(self):
         """
         Closes connected socket if connected.
         """
-        with self.lock:
+        lock = self.lock
+        if lock is None:
+            lock = _NullContextManager()
+        with lock:
             if self.socket:
                 try:
                     self.socket.close()