merge conflicts

Author: bencrabtree

tests/unit/sagemaker/serve/utils/test_telemetry_logger.py

@@ -95,6 +95,7 @@ def test_capture_telemetry_decorator_djl_success(self, mock_send_telemetry):
 
         mock_send_telemetry.assert_called_once_with(
             "1", 2, MOCK_SESSION, None, None, expected_extra_str
+        )
 
     @patch("sagemaker.serve.utils.telemetry_logger._send_telemetry")
     def test_capture_telemetry_decorator_djl_success_with_custom_image(self, mock_send_telemetry):
@@ -123,6 +124,8 @@ def test_capture_telemetry_decorator_djl_success_with_custom_image(self, mock_se
         )
 
         mock_send_telemetry.assert_called_once_with(
+            "1", 2, MOCK_SESSION, None, None, expected_extra_str
+        )
 
     @patch("sagemaker.serve.utils.telemetry_logger._send_telemetry")
     def test_capture_telemetry_decorator_tgi_success(self, mock_send_telemetry):