allow to override keep_alive with socket_options

Author: sentrivana

sentry_sdk/transport.py

@@ -462,10 +462,19 @@ def _get_pool_options(self, ca_certs):
             "ca_certs": ca_certs or certifi.where(),
         }
 
+        socket_options = []
+
         if self.options["socket_options"]:
-            options["socket_options"] = self.options["socket_options"]
-        elif self.options["keep_alive"]:
-            options["socket_options"] = KEEP_ALIVE_SOCKET_OPTIONS
+            socket_options = self.options["socket_options"]
+
+        if self.options["keep_alive"]:
+            used_options = {(o[0], o[1]) for o in socket_options}
+            for default_option in KEEP_ALIVE_SOCKET_OPTIONS:
+                if (default_option[0], default_option[1]) not in used_options:
+                    socket_options.append(default_option)
+
+        if socket_options:
+            options["socket_options"] = socket_options
 
         return options
 

tests/test_transport.py

@@ -187,6 +187,22 @@ def test_socket_options_override_keep_alive(make_client):
     assert options["socket_options"] == socket_options
 
 
+def test_socket_options_merge_keep_alive_with_socket_options(make_client):
+    socket_options = [
+        (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
+        (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
+    ]
+
+    client = make_client(socket_options=socket_options, keep_alive=True)
+
+    options = client.transport._get_pool_options([])
+    assert options["socket_options"] == [
+        (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 42),
+        (socket.SOL_TCP, socket.TCP_KEEPINTVL, 42),
+        (socket.SOL_TCP, socket.TCP_KEEPCNT, 6),
+    ]
+
+
 def test_keep_alive_off_by_default(make_client):
     client = make_client()