Add network timeout config to signer/upload requests

iopipe/contrib/logger/plugin.py

@@ -74,7 +74,7 @@ def post_invoke(self, event, context):
         self.handler.flush()
         if self.handler.stream.tell():
             self.signed_request = self.iopipe.submit_future(
-                get_signed_request, self.iopipe.config["token"], self.context, ".log"
+                get_signed_request, self.iopipe.config, self.context, ".log"
             )
         if self.redirect_stdout is True:
             sys.stdout = sys.__stdout__
@@ -96,7 +96,10 @@ def pre_report(self, report):
                 and "signedRequest" in self.signed_request
             ):
                 self.iopipe.submit_future(
-                    upload_log_data, self.signed_request["signedRequest"], stream
+                    upload_log_data,
+                    self.signed_request["signedRequest"],
+                    stream,
+                    self.iopipe.config,
                 )
                 if "jwtAccess" in self.signed_request:
                     plugin = next((p for p in report.plugins if p["name"] == self.name))

iopipe/contrib/logger/request.py

@@ -11,21 +11,26 @@
 logger = logging.getLogger(__name__)
 
 
-def upload_log_data(url, stream_or_file):
+def upload_log_data(url, stream_or_file, config):
     """
     Uploads log data to IOpipe.
 
     :param url: The signed URL
     :param stream_or_file: The log data stream or file
+    :param config: The IOpipe config
     """
     try:
         logger.debug("Uploading log data to IOpipe")
         if isinstance(stream_or_file, StringIO):
             stream_or_file.seek(0)
-            response = requests.put(url, data=stream_or_file, timeout=None)
+            response = requests.put(
+                url, data=stream_or_file, timeout=config["network_timeout"]
+            )
         else:
             with open(stream_or_file, "rb") as data:
-                response = requests.put(url, data=data, timeout=None)
+                response = requests.put(
+                    url, data=data, timeout=config["network_timeout"]
+                )
         response.raise_for_status()
     except Exception as e:
         logger.debug("Error while uploading log data: %s", e)

iopipe/contrib/profiler/plugin.py

@@ -53,10 +53,7 @@ def pre_invoke(self, event, context):
 
         if self.enabled:
             self.signed_request = self.iopipe.submit_future(
-                get_signed_request,
-                self.iopipe.config["token"],
-                self.context,
-                ".cprofile",
+                get_signed_request, self.iopipe.config, self.context, ".cprofile"
             )
             self.profile = profile.Profile()
             self.profile.enable()
@@ -82,6 +79,7 @@ def pre_report(self, report):
                         upload_profiler_report,
                         self.signed_request["signedRequest"],
                         stats_file.name,
+                        self.iopipe.config,
                     )
                     self.stats_file = stats_file.name
                 if "jwtAccess" in self.signed_request:

iopipe/contrib/profiler/request.py

@@ -9,17 +9,18 @@
 logger = logging.getLogger(__name__)
 
 
-def upload_profiler_report(url, filename):
+def upload_profiler_report(url, filename, config):
     """
     Uploads a profiler report to IOpipe
 
     :param url: The signed URL
-    :param filename: The profiler report file.
+    :param filename: The profiler report file
+    :param config: The IOpipe config
     """
     try:
         logger.debug("Uploading profiler report to IOpipe")
         with open(filename, "rb") as data:
-            response = requests.put(url, data=data)
+            response = requests.put(url, data=data, timeout=config["network_timeout"])
         response.raise_for_status()
     except Exception as e:
         logger.debug("Error while uploading profiler report: %s", e)

iopipe/signer.py

@@ -24,13 +24,13 @@ def get_signer_hostname():
     return "signer.{region}.iopipe.com".format(region=region)
 
 
-def get_signed_request(token, context, extension):
+def get_signed_request(config, context, extension):
     """
     Returns a signed request URL from IOpipe
 
-    :param token: The IOpipe token.
+    :param config: The IOpipe config
     :param context: The AWS context to request a signed URL
-    :param extension: The extension of the file to sign.
+    :param extension: The extension of the file to sign
     :returns: A signed request URL
     :rtype: str
     """
@@ -46,7 +46,8 @@ def get_signed_request(token, context, extension):
                 "timestamp": int(time.time() * 1000),
                 "extension": extension,
             },
-            headers={"Authorization": token},
+            headers={"Authorization": config["token"]},
+            timeout=config["network_timeout"],
         )
         response.raise_for_status()
     except Exception as e:

tests/contrib/logger/test_plugin.py

@@ -32,10 +32,10 @@ def test__logger_plugin(
 
     handler({}, mock_context)
 
-    mock_get_signed_request.assert_called_once_with(
-        iopipe.config["token"], mock.ANY, ".log"
+    mock_get_signed_request.assert_called_once_with(iopipe.config, mock.ANY, ".log")
+    mock_upload_log_data.assert_called_once_with(
+        "https://mock_signed_url", mock.ANY, iopipe.config
     )
-    mock_upload_log_data.assert_called_once_with("https://mock_signed_url", mock.ANY)
 
     plugin = next((p for p in iopipe.report.plugins if p["name"] == "logger"))
     assert plugin["uploads"][0] == "foobar"

tests/contrib/logger/test_request.py

@@ -11,6 +11,6 @@ def test__upload_log_data__deletes_file(mock_requests):
     temp_file = tempfile.NamedTemporaryFile(delete=False)
     temp_file.close()
 
-    upload_log_data("", temp_file.name)
+    upload_log_data("", temp_file.name, {"network_timeout": 5})
 
     assert not os.path.exists(temp_file.name)

tests/contrib/profiler/test_plugin.py

@@ -26,10 +26,10 @@ def test__profiler_plugin(
     handler({}, mock_context)
 
     mock_get_signed_request.assert_called_once_with(
-        iopipe.config["token"], mock.ANY, ".cprofile"
+        iopipe.config, mock.ANY, ".cprofile"
     )
     mock_upload_profiler_report.assert_called_once_with(
-        "https://mock_signed_url", mock.ANY
+        "https://mock_signed_url", mock.ANY, iopipe.config
     )
 
     plugin = next((p for p in iopipe.report.plugins if p["name"] == "profiler"))

tests/contrib/profiler/test_request.py

@@ -11,6 +11,6 @@ def test__upload_profiler_report__deletes_file(mock_requests):
     temp_file = tempfile.NamedTemporaryFile(delete=False)
     temp_file.close()
 
-    upload_profiler_report("", temp_file.name)
+    upload_profiler_report("", temp_file.name, {"network_timeout": 5})
 
     assert not os.path.exists(temp_file.name)