Skip to content

Commit

Permalink
[exporter/datadog] Lower gohai logs to debug level (#31703)
Browse files Browse the repository at this point in the history
**Description:** Demote gohai logs to debug level

**Link to tracking Issue:** Fixes #29741
  • Loading branch information
mx-psi authored and DougManton committed Mar 13, 2024
1 parent 26c3b6f commit 8a10ec9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 5 deletions.
28 changes: 28 additions & 0 deletions .chloggen/mx-psi_lower-log-level-gohai.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/datadog

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Demote noisy gohai logs to debug level

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [29741]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
These logs would be present at the info level when using the official Docker images but were not useful to end-users.
# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ func newGohai(logger *zap.Logger) *gohai.Gohai {
res := new(gohai.Gohai)

if p, err := new(cpu.Cpu).Collect(); err != nil {
logger.Info("Failed to retrieve cpu metadata", zap.Error(err))
logger.Debug("Failed to retrieve cpu metadata", zap.Error(err))
} else if cpu, ok := p.(map[string]string); !ok {
logger.Warn("Internal error: Failed to cast cpu metadata to map[string]string", zap.Any("cpu", p))
} else {
res.CPU = cpu
}

if p, err := new(filesystem.FileSystem).Collect(); err != nil {
logger.Info("Failed to retrieve filesystem metadata", zap.Error(err))
logger.Debug("Failed to retrieve filesystem metadata", zap.Error(err))
} else if fs, ok := p.([]any); !ok {
logger.Warn("Internal error: Failed to cast filesystem metadata to []any", zap.Any("filesystem", p))
} else {
res.FileSystem = fs
}

if p, err := new(memory.Memory).Collect(); err != nil {
logger.Info("Failed to retrieve memory metadata", zap.Error(err))
logger.Debug("Failed to retrieve memory metadata", zap.Error(err))
} else if mem, ok := p.(map[string]string); !ok {
logger.Warn("Internal error: Failed to cast memory metadata to map[string]string", zap.Any("memory", p))
} else {
Expand All @@ -51,15 +51,15 @@ func newGohai(logger *zap.Logger) *gohai.Gohai {

// in case of containerized environment, this would return pod id not node's ip
if p, err := new(network.Network).Collect(); err != nil {
logger.Info("Failed to retrieve network metadata", zap.Error(err))
logger.Debug("Failed to retrieve network metadata", zap.Error(err))
} else if net, ok := p.(map[string]any); !ok {
logger.Warn("Internal error: Failed to cast network metadata to map[string]any", zap.Any("network", p))
} else {
res.Network = net
}

if p, err := new(platform.Platform).Collect(); err != nil {
logger.Info("Failed to retrieve platform metadata", zap.Error(err))
logger.Debug("Failed to retrieve platform metadata", zap.Error(err))
} else if platform, ok := p.(map[string]string); !ok {
logger.Warn("Internal error: Failed to cast platform metadata to map[string]string", zap.Any("platform", p))
} else {
Expand Down

0 comments on commit 8a10ec9

Please sign in to comment.