Skip to content

Commit

Permalink
[processor/resourcedetection] Move processor.resourcedetection.hostCP…
Browse files Browse the repository at this point in the history
…USteppingAsString feature gate to stable (open-telemetry#35202)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

Follows
open-telemetry#33076
and
open-telemetry#31165.

**Link to tracking Issue:** <Issue number if applicable>
open-telemetry#31136

**Testing:** <Describe what testing was performed and which tests were
added.>

**Documentation:** <Describe the documentation added.>

/cc @mx-psi

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
  • Loading branch information
ChrsMark authored and jriguera committed Oct 4, 2024
1 parent 59b9dd2 commit c92d627
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 25 deletions.
27 changes: 27 additions & 0 deletions .chloggen/cpu_stepping_fg_stable.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: breaking

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Move `processor.resourcedetection.hostCPUSteppingAsString` feature gate to stable.

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

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

This file was deleted.

19 changes: 5 additions & 14 deletions processor/resourcedetectionprocessor/internal/system/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ var (
featuregate.WithRegisterToVersion("v0.101.0"),
featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/semantic-conventions/issues/495"),
)
hostCPUSteppingAsStringID = "processor.resourcedetection.hostCPUSteppingAsString"
hostCPUSteppingAsStringFeatureGate = featuregate.GlobalRegistry().MustRegister(
hostCPUSteppingAsStringID,
featuregate.StageBeta,
_ = featuregate.GlobalRegistry().MustRegister(
"processor.resourcedetection.hostCPUSteppingAsString",
featuregate.StageStable,
featuregate.WithRegisterDescription("Change type of host.cpu.stepping to string."),
featuregate.WithRegisterFromVersion("v0.95.0"),
featuregate.WithRegisterToVersion("v0.110.0"),
featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/semantic-conventions/issues/664"),
)
)
Expand Down Expand Up @@ -215,15 +215,6 @@ func setHostCPUInfo(d *Detector, cpuInfo cpu.InfoStat) {
}

d.rb.SetHostCPUModelName(cpuInfo.ModelName)
if hostCPUSteppingAsStringFeatureGate.IsEnabled() {
d.rb.SetHostCPUStepping(fmt.Sprintf("%d", cpuInfo.Stepping))
} else {
// https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31136
d.logger.Info("This attribute will change from int to string. Switch now using the feature gate.",
zap.String("attribute", "host.cpu.stepping"),
zap.String("feature gate", hostCPUSteppingAsStringID),
)
d.rb.SetHostCPUSteppingAsInt(int64(cpuInfo.Stepping))
}
d.rb.SetHostCPUStepping(fmt.Sprintf("%d", cpuInfo.Stepping))
d.rb.SetHostCPUCacheL2Size(int64(cpuInfo.CacheSize))
}

0 comments on commit c92d627

Please sign in to comment.