Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit293aeaa

Browse files
committed
Revert "telemetry circuit breaker"
This reverts commita5f46eb.
1 parenta5f46eb commit293aeaa

File tree

4 files changed

+3
-126
lines changed

4 files changed

+3
-126
lines changed

‎poetry.lock‎

Lines changed: 1 addition & 15 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ oauthlib = "^3.1.0"
2121
openpyxl ="^3.0.10"
2222
urllib3 =">=1.26"
2323
python-dateutil ="^2.8.0"
24-
pybreaker ="^0.6.0"
2524
pyarrow = [
2625
{version =">=14.0.1",python =">=3.8,<3.13",optional=true },
2726
{version =">=18.0.0",python =">=3.13",optional=true }

‎src/databricks/sql/common/http.py‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
importlogging
1010
fromrequests.adaptersimportHTTPAdapter
1111
fromdatabricks.sql.auth.retryimportDatabricksRetryPolicy,CommandType
12-
frompybreakerimportCircuitBreaker,CircuitBreakerError
1312

1413
logger=logging.getLogger(__name__)
1514

@@ -110,9 +109,6 @@ class TelemetryHttpClient: # TODO: Unify all the http clients in the PySQL Conn
110109
TELEMETRY_RETRY_DELAY_MAX=10.0
111110
TELEMETRY_RETRY_STOP_AFTER_ATTEMPTS_DURATION=30.0
112111

113-
CIRCUIT_BREAKER_FAIL_MAX=5
114-
CIRCUIT_BREAKER_RESET_TIMEOUT=60
115-
116112
def__init__(self):
117113
"""Initializes the session and mounts the custom retry adapter."""
118114
retry_policy=DatabricksRetryPolicy(
@@ -127,10 +123,6 @@ def __init__(self):
127123
self.session=requests.Session()
128124
self.session.mount("https://",adapter)
129125
self.session.mount("http://",adapter)
130-
self.breaker=CircuitBreaker(
131-
fail_max=self.CIRCUIT_BREAKER_FAIL_MAX,
132-
reset_timeout=self.CIRCUIT_BREAKER_RESET_TIMEOUT,
133-
)
134126

135127
@classmethod
136128
defget_instance(cls)->"TelemetryHttpClient":
@@ -149,14 +141,7 @@ def post(self, url: str, **kwargs) -> requests.Response:
149141
This is a blocking call intended to be run in a background thread.
150142
"""
151143
logger.debug("Executing telemetry POST request to: %s",url)
152-
try:
153-
returnself.breaker.call(self.session.post,url,**kwargs)
154-
exceptCircuitBreakerErrorase:
155-
logger.error("Circuit breaker error: %s",e)
156-
raisee
157-
exceptExceptionase:
158-
logger.error("Error executing telemetry POST request: %s",e)
159-
raisee
144+
returnself.session.post(url,**kwargs)
160145

161146
defclose(self):
162147
"""Closes the underlying requests.Session."""

‎tests/unit/test_telemetry.py‎

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
importuuid
22
importpytest
33
fromunittest.mockimportpatch,MagicMock
4-
importtime
5-
importrequests
6-
frompybreakerimportCircuitBreakerError
7-
fromdatabricks.sql.common.httpimportTelemetryHttpClient
84

95
fromdatabricks.sql.telemetry.telemetry_clientimport (
106
TelemetryClient,
117
NoopTelemetryClient,
128
TelemetryClientFactory,
139
TelemetryHelper,
10+
BaseTelemetryClient,
1411
)
1512
fromdatabricks.sql.telemetry.models.enumsimportAuthMech,AuthFlow
1613
fromdatabricks.sql.auth.authenticatorsimport (
@@ -319,93 +316,3 @@ def test_connection_failure_sends_correct_telemetry_payload(
319316
call_arguments=mock_export_failure_log.call_args
320317
assertcall_arguments[0][0]=="Exception"
321318
assertcall_arguments[0][1]==error_message
322-
323-
324-
classTestTelemetryHttpClient:
325-
"""Tests for the TelemetryHttpClient, including retry and circuit breaker logic."""
326-
327-
@pytest.fixture
328-
defhttp_client(self):
329-
"""
330-
Provides a fresh TelemetryHttpClient instance for each test,
331-
ensuring the singleton state is reset.
332-
"""
333-
ifTelemetryHttpClient._instance:
334-
TelemetryHttpClient.get_instance().close()
335-
336-
client=TelemetryHttpClient.get_instance()
337-
yieldclient
338-
339-
client.close()
340-
341-
deftest_circuit_breaker_opens_after_failures(self,http_client):
342-
"""Verify the circuit opens after N consecutive failures and rejects new calls."""
343-
fail_max=3
344-
http_client.breaker.fail_max=fail_max
345-
346-
withpatch.object(http_client.session,"post")asmock_post:
347-
mock_post.side_effect=requests.exceptions.RequestException("Connection failed")
348-
349-
for_inrange(fail_max-1):
350-
withpytest.raises(requests.exceptions.RequestException):
351-
http_client.post("https://test.com/telemetry")
352-
353-
withpytest.raises(CircuitBreakerError):
354-
http_client.post("https://test.com/telemetry")
355-
356-
asserthttp_client.breaker.current_state=="open"
357-
assertmock_post.call_count==fail_max
358-
359-
withpytest.raises(CircuitBreakerError):
360-
http_client.post("https://test.com/telemetry")
361-
assertmock_post.call_count==fail_max
362-
363-
deftest_circuit_breaker_closes_after_timeout_and_success(self,http_client):
364-
"""Verify the circuit moves to half-open and then closes after a successful probe."""
365-
fail_max=2
366-
reset_timeout=0.1
367-
http_client.breaker.fail_max=fail_max
368-
http_client.breaker.reset_timeout=reset_timeout
369-
370-
withpatch.object(http_client.session,"post")asmock_post:
371-
mock_post.side_effect= [
372-
requests.exceptions.RequestException("Fail 1"),
373-
requests.exceptions.RequestException("Fail 2"),
374-
MagicMock(ok=True)
375-
]
376-
377-
withpytest.raises(requests.exceptions.RequestException):
378-
http_client.post("https://test.com")
379-
withpytest.raises(CircuitBreakerError):
380-
http_client.post("https://test.com")
381-
382-
asserthttp_client.breaker.current_state=="open"
383-
time.sleep(reset_timeout)
384-
385-
http_client.post("https://test.com")
386-
asserthttp_client.breaker.current_state=="closed"
387-
assertmock_post.call_count==3
388-
389-
deftest_circuit_breaker_reopens_if_probe_fails(self,http_client):
390-
"""Verify the circuit moves to half-open and then back to open if the probe fails."""
391-
fail_max=2
392-
reset_timeout=0.1
393-
http_client.breaker.fail_max=fail_max
394-
http_client.breaker.reset_timeout=reset_timeout
395-
396-
withpatch.object(http_client.session,"post")asmock_post:
397-
mock_post.side_effect=requests.exceptions.RequestException("Always fails")
398-
399-
withpytest.raises(requests.exceptions.RequestException):
400-
http_client.post("https://test.com")
401-
withpytest.raises(CircuitBreakerError):
402-
http_client.post("https://test.com")
403-
404-
asserthttp_client.breaker.current_state=="open"
405-
time.sleep(reset_timeout)
406-
407-
withpytest.raises(CircuitBreakerError):
408-
http_client.post("https://test.com")
409-
410-
asserthttp_client.breaker.current_state=="open"
411-
assertmock_post.call_count==3

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp