Skip to content

Commit 4230db8

Browse files
authored
Agent Logging: Don't log stacktraces for connection errors (#227)
1 parent 0394a92 commit 4230db8

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

instana/agent.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ def announce(self, discovery):
212212

213213
if response.status_code == 200:
214214
self.last_seen = datetime.now()
215-
except:
216-
logger.debug("announce: ", exc_info=True)
215+
except Exception as e:
216+
logger.debug("announce: connection error (%s)", type(e))
217217
finally:
218218
return response
219219

@@ -227,8 +227,8 @@ def is_agent_ready(self):
227227

228228
if response.status_code == 200:
229229
ready = True
230-
except:
231-
logger.debug("is_agent_ready: ", exc_info=True)
230+
except Exception as e:
231+
logger.debug("is_agent_ready: connection error (%s)", type(e))
232232
finally:
233233
return ready
234234

@@ -247,8 +247,8 @@ def report_data_payload(self, entity_data):
247247

248248
if response.status_code == 200:
249249
self.last_seen = datetime.now()
250-
except:
251-
logger.debug("report_data: Instana host agent connection error", exc_info=True)
250+
except Exception as e:
251+
logger.debug("report_data_payload: Instana host agent connection error (%s)", type(e))
252252
finally:
253253
return response
254254

@@ -272,8 +272,8 @@ def report_traces(self, spans):
272272

273273
if response.status_code == 200:
274274
self.last_seen = datetime.now()
275-
except:
276-
logger.debug("report_traces: ", exc_info=True)
275+
except Exception as e:
276+
logger.debug("report_traces: Instana host agent connection error (%s)", type(e))
277277
finally:
278278
return response
279279

@@ -310,8 +310,8 @@ def __task_response(self, message_id, data):
310310
data=payload,
311311
headers={"Content-Type": "application/json"},
312312
timeout=0.8)
313-
except:
314-
logger.debug("task_response: ", exc_info=True)
313+
except Exception as e:
314+
logger.debug("__task_response: Instana host agent connection error (%s)", type(e))
315315
finally:
316316
return response
317317

@@ -408,8 +408,8 @@ def report_data_payload(self, payload):
408408
verify=ssl_verify)
409409

410410
logger.debug("report_data_payload: response.status_code is %s", response.status_code)
411-
except:
412-
logger.debug("report_data_payload: ", exc_info=True)
411+
except Exception as e:
412+
logger.debug("report_data_payload: connection error (%s)", type(e))
413413
finally:
414414
return response
415415

0 commit comments

Comments
 (0)