diff --git a/.chloggen/fix-parsing-error-windows-resourcedetection.yaml b/.chloggen/fix-parsing-error-windows-resourcedetection.yaml new file mode 100644 index 000000000000..e56b6e9e9eb8 --- /dev/null +++ b/.chloggen/fix-parsing-error-windows-resourcedetection.yaml @@ -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: [] diff --git a/processor/resourcedetectionprocessor/internal/system/system.go b/processor/resourcedetectionprocessor/internal/system/system.go index 9b6fa25bc64c..63aec3aaaddb 100644 --- a/processor/resourcedetectionprocessor/internal/system/system.go +++ b/processor/resourcedetectionprocessor/internal/system/system.go @@ -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))