Skip to content

Commit

Permalink
[processor/resourcedetection] fix parsing error for windows (open-tel…
Browse files Browse the repository at this point in the history
…emetry#27678)

**Description:** 
The `system` detector extracts all the `cpu` info from the system even
if you disable the configs and I believe this is where the bug kicks in.
Disabling the settings will only stop it from setting the resource
attributes.

The
[library](https://github.com/shirou/gopsutil/blob/v3.23.9/cpu/cpu_windows.go#L113)
that we rely on doesn't extract some attributes for Windows OS (in this
case, the field `cpu.Model`) and it leaves this field empty. This
results in a bug when we try to parse an empty string.

The long-term fix will be to extract `cpu.Model` in `gopsutil` upstream
library.

**Link to tracking Issue:**
open-telemetry#27675
  • Loading branch information
VihasMakwana authored and JaredTan95 committed Oct 18, 2023
1 parent e8113c2 commit bb36f05
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 4 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-parsing-error-windows-resourcedetection.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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: processor/resourcedetection

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Don't parse the field `cpuInfo.Model` if it's blank.

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

# (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:

# 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: []
13 changes: 9 additions & 4 deletions processor/resourcedetectionprocessor/internal/system/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,16 @@ func setHostCPUInfo(d *Detector, cpuInfo cpu.InfoStat) error {
}
d.rb.SetHostCPUFamily(family)

model, err := strconv.ParseInt(cpuInfo.Model, 10, 64)
if err != nil {
return fmt.Errorf("failed to convert cpuinfo model to integer: %w", err)
// For windows, this field is left blank. See https://github.com/shirou/gopsutil/blob/v3.23.9/cpu/cpu_windows.go#L113
// Skip setting modelId if the field is blank.
// ISSUE: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27675
if cpuInfo.Model != "" {
model, err := strconv.ParseInt(cpuInfo.Model, 10, 64)
if err != nil {
return fmt.Errorf("failed to convert cpuinfo model to integer: %w", err)
}
d.rb.SetHostCPUModelID(model)
}
d.rb.SetHostCPUModelID(model)

d.rb.SetHostCPUModelName(cpuInfo.ModelName)
d.rb.SetHostCPUStepping(int64(cpuInfo.Stepping))
Expand Down

0 comments on commit bb36f05

Please sign in to comment.