Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support trace logging #2838

Merged
merged 2 commits into from
Dec 27, 2018
Merged

Support trace logging #2838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b607f36
Support trace logging
ofek Dec 27, 2018
e9f74c8
address review
ofek Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion datadog_checks_base/datadog_checks/base/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@

from .utils.common import ensure_bytes

# Arbitrary number less than 10 (DEBUG)
TRACE_LEVEL = 7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment to detail from where this number come from?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5 might make more sense

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7 is what was set in https://github.com/DataDog/datadog-agent/pull/2826/files#diff-b86e4efc0a6508ff3165b8881d6297b2R156



class AgentLogger(logging.getLoggerClass()):
def trace(self, msg, *args, **kwargs):
if self.isEnabledFor(TRACE_LEVEL):
self._log(TRACE_LEVEL, msg, args, **kwargs)


class AgentLogHandler(logging.Handler):
"""
Expand All @@ -34,7 +43,7 @@ def emit(self, record):
'WARNING': logging.WARNING,
'INFO': logging.INFO,
'DEBUG': logging.DEBUG,
'TRACE': logging.DEBUG,
'TRACE': TRACE_LEVEL,
}


Expand All @@ -53,6 +62,8 @@ def init_logging():
Initialize logging (set up forwarding to Go backend and sane defaults)
"""
# Forward to Go backend
logging.addLevelName(TRACE_LEVEL, 'TRACE')
logging.setLoggerClass(AgentLogger)
rootLogger = logging.getLogger()
rootLogger.addHandler(AgentLogHandler())
rootLogger.setLevel(_get_py_loglevel(datadog_agent.get_config('log_level')))
Expand Down