[processor/resourcedetection] Graduate `processor.resourcedetection.h…

…ostCPUModelAndFamilyAsString` to beta

.chloggen/mx-psi_rdp-fg.yaml

@@ -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: resourcedetectionprocessor
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Change type of `host.cpu.model.id` and `host.cpu.model.family` from int to string.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [29025]
+
+# (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: |
+ - Disable the `processor.resourcedetection.hostCPUModelAndFamilyAsString` feature gate to get the old behavior.
+
+# 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: []

processor/resourcedetectionprocessor/internal/system/system.go

@@ -25,7 +25,7 @@ var (
  hostCPUModelAndFamilyAsStringID = "processor.resourcedetection.hostCPUModelAndFamilyAsString"
  hostCPUModelAndFamilyAsStringFeatureGate = featuregate.GlobalRegistry().MustRegister(
  hostCPUModelAndFamilyAsStringID,
- featuregate.StageAlpha,
+ featuregate.StageBeta,
  featuregate.WithRegisterDescription("Change type of host.cpu.model.id and host.cpu.model.family to string."),
  featuregate.WithRegisterFromVersion("v0.89.0"),
  featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/semantic-conventions/issues/495"),
@@ -160,13 +160,13 @@ func setHostCPUInfo(d *Detector, cpuInfo cpu.InfoStat) error {
  d.logger.Debug("getting host's cpuinfo", zap.String("coreID", cpuInfo.CoreID))
  d.rb.SetHostCPUVendorID(cpuInfo.VendorID)
  if hostCPUModelAndFamilyAsStringFeatureGate.IsEnabled() {
- d.rb.SetHostCPUFamily(cpuInfo.Family)
- } else {
  // https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29025
- d.logger.Warn("This attribute will change from int to string. Switch now using the feature gate.",
+ d.logger.Info("This attribute changed from int to string. Temporarily switch back to int using the feature gate.",
  zap.String("attribute", "host.cpu.family"),
  zap.String("feature gate", hostCPUModelAndFamilyAsStringID),
  )
+ d.rb.SetHostCPUFamily(cpuInfo.Family)
+ } else {
  family, err := strconv.ParseInt(cpuInfo.Family, 10, 64)
  if err != nil {
  return fmt.Errorf("failed to convert cpuinfo family to integer: %w", err)
@@ -179,13 +179,13 @@ func setHostCPUInfo(d *Detector, cpuInfo cpu.InfoStat) error {
  // ISSUE: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27675
  if cpuInfo.Model != "" {
  if hostCPUModelAndFamilyAsStringFeatureGate.IsEnabled() {
- d.rb.SetHostCPUModelID(cpuInfo.Model)
- } else {
  // https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29025
- d.logger.Warn("This attribute will change from int to string. Switch now using the feature gate.",
+ d.logger.Info("This attribute changed from int to string. Temporarily switch back to int using the feature gate.",
  zap.String("attribute", "host.cpu.model.id"),
  zap.String("feature gate", hostCPUModelAndFamilyAsStringID),
  )
+ d.rb.SetHostCPUModelID(cpuInfo.Model)
+ } else {
  model, err := strconv.ParseInt(cpuInfo.Model, 10, 64)
  if err != nil {
  return fmt.Errorf("failed to convert cpuinfo model to integer: %w", err)