Skip to content

Commit 208e241

Browse files
authored
Lower log level for server version problems (#1692)
* Lower log level for server version problems * Update tests
1 parent 2e3ad36 commit 208e241

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

elasticapm/transport/http.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,13 @@ def fetch_server_info(self):
218218
logger.debug("Fetched APM Server version %s", version)
219219
self.client.server_version = version_string_to_tuple(version)
220220
except (urllib3.exceptions.RequestError, urllib3.exceptions.HTTPError) as e:
221-
logger.warning("HTTP error while fetching server information: %s", str(e))
221+
logger.debug("HTTP error while fetching server information: %s", str(e))
222222
except json.JSONDecodeError as e:
223-
logger.warning("JSON decoding error while fetching server information: %s", str(e))
223+
logger.debug(
224+
f"JSON decoding error while fetching server information. Error: {str(e)} Body: {body.decode('utf8')}"
225+
)
224226
except (KeyError, TypeError):
225-
logger.warning("No version key found in server response: %s", response.data)
227+
logger.debug("No version key found in server response: %s", response.data)
226228

227229
@property
228230
def cert_fingerprint(self):

tests/transports/test_urllib3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ def test_fetch_server_info_no_json(waiting_httpserver, caplog, elasticapm_client
440440
)
441441
url = waiting_httpserver.url
442442
transport = Transport(url + "/" + constants.EVENTS_API_PATH, client=elasticapm_client)
443-
with caplog.at_level("WARNING"):
443+
with caplog.at_level("DEBUG", logger="elasticapm.transport.http"):
444444
transport.fetch_server_info()
445445
assert elasticapm_client.server_version is None
446446
assert_any_record_contains(caplog.records, "JSON decoding error while fetching server information")
@@ -453,7 +453,7 @@ def test_fetch_server_info_no_version(waiting_httpserver, caplog, elasticapm_cli
453453
)
454454
url = waiting_httpserver.url
455455
transport = Transport(url + "/" + constants.EVENTS_API_PATH, client=elasticapm_client)
456-
with caplog.at_level("WARNING"):
456+
with caplog.at_level("DEBUG", logger="elasticapm.transport.http"):
457457
transport.fetch_server_info()
458458
assert elasticapm_client.server_version is None
459459
assert_any_record_contains(caplog.records, "No version key found in server response")
@@ -466,7 +466,7 @@ def test_fetch_server_info_flat_string(waiting_httpserver, caplog, elasticapm_cl
466466
)
467467
url = waiting_httpserver.url
468468
transport = Transport(url + "/" + constants.EVENTS_API_PATH, client=elasticapm_client)
469-
with caplog.at_level("WARNING"):
469+
with caplog.at_level("DEBUG", logger="elasticapm.transport.http"):
470470
transport.fetch_server_info()
471471
assert elasticapm_client.server_version is None
472472
assert_any_record_contains(caplog.records, "No version key found in server response")

0 commit comments

Comments
 (0)