Skip to content

Commit 2bd2593

Browse files
committed
fix testing issue
1 parent 81f2549 commit 2bd2593

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/exporter/otlp/aws/logs/aws_batch_log_record_processor.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ def _estimate_log_size(self, log: LogData, depth: int = 3) -> int:
146146
size += len(key)
147147
new_queue.append((content, current_depth + 1))
148148
else:
149-
_logger.debug(f"Max log depth of {depth} exceeded. Log data size will not be accurately calculated.")
149+
_logger.debug(
150+
f"Max log depth of {depth} exceeded. Log data size will not be accurately calculated."
151+
)
150152

151153
queue = new_queue
152154

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/otlp/aws/logs/test_otlp_aws_logs_exporter.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def setUp(self):
3838
self.logs = self.generate_test_log_data()
3939
self.exporter = OTLPAwsLogExporter(endpoint=self._ENDPOINT)
4040

41-
@patch("requests.Session.request", return_value=good_response)
41+
@patch("requests.Session.post", return_value=good_response)
4242
def test_export_success(self, mock_request):
4343
"""Tests that the exporter always compresses the serialized logs with gzip before exporting."""
4444
result = self.exporter.export(self.logs)
@@ -56,7 +56,7 @@ def test_export_success(self, mock_request):
5656
self.assertTrue(len(data) >= 10)
5757
self.assertEqual(data[0:2], b"\x1f\x8b")
5858

59-
@patch("requests.Session.request", return_value=good_response)
59+
@patch("requests.Session.post", return_value=good_response)
6060
def test_export_gen_ai_logs(self, mock_request):
6161
"""Tests that when set_gen_ai_log_flag is set, the exporter includes the LLO header in the request."""
6262

@@ -74,7 +74,7 @@ def test_export_gen_ai_logs(self, mock_request):
7474
self.assertIn(self.exporter._LARGE_LOG_HEADER, headers)
7575
self.assertEqual(headers[self.exporter._LARGE_LOG_HEADER], self.exporter._LARGE_GEN_AI_LOG_PATH_HEADER)
7676

77-
@patch("requests.Session.request", return_value=good_response)
77+
@patch("requests.Session.post", return_value=good_response)
7878
def test_should_not_export_if_shutdown(self, mock_request):
7979
"""Tests that no export request is made if the exporter is shutdown."""
8080
self.exporter.shutdown()
@@ -83,7 +83,7 @@ def test_should_not_export_if_shutdown(self, mock_request):
8383
mock_request.assert_not_called()
8484
self.assertEqual(result, LogExportResult.FAILURE)
8585

86-
@patch("requests.Session.request", return_value=non_retryable_response)
86+
@patch("requests.Session.post", return_value=non_retryable_response)
8787
def test_should_not_export_again_if_not_retryable(self, mock_request):
8888
"""Tests that only one export request is made if the response status code is non-retryable."""
8989
result = self.exporter.export(self.logs)
@@ -94,7 +94,7 @@ def test_should_not_export_again_if_not_retryable(self, mock_request):
9494
@patch(
9595
"amazon.opentelemetry.distro.exporter.otlp.aws.logs.otlp_aws_logs_exporter.sleep", side_effect=lambda x: None
9696
)
97-
@patch("requests.Session.request", return_value=retryable_response_no_header)
97+
@patch("requests.Session.post", return_value=retryable_response_no_header)
9898
def test_should_export_again_with_backoff_if_retryable_and_no_retry_after_header(self, mock_request, mock_sleep):
9999
"""Tests that multiple export requests are made with exponential delay if the response status code is retryable.
100100
But there is no Retry-After header."""
@@ -116,7 +116,7 @@ def test_should_export_again_with_backoff_if_retryable_and_no_retry_after_header
116116
"amazon.opentelemetry.distro.exporter.otlp.aws.logs.otlp_aws_logs_exporter.sleep", side_effect=lambda x: None
117117
)
118118
@patch(
119-
"requests.Session.request",
119+
"requests.Session.post",
120120
side_effect=[retryable_response_header, retryable_response_header, retryable_response_header, good_response],
121121
)
122122
def test_should_export_again_with_server_delay_if_retryable_and_retry_after_header(self, mock_request, mock_sleep):
@@ -136,7 +136,7 @@ def test_should_export_again_with_server_delay_if_retryable_and_retry_after_head
136136
"amazon.opentelemetry.distro.exporter.otlp.aws.logs.otlp_aws_logs_exporter.sleep", side_effect=lambda x: None
137137
)
138138
@patch(
139-
"requests.Session.request",
139+
"requests.Session.post",
140140
side_effect=[
141141
retryable_response_bad_header,
142142
retryable_response_bad_header,

0 commit comments

Comments
 (0)