From 3d81cbe1be8e260266b10ed36a63408a6da1a85b Mon Sep 17 00:00:00 2001 From: Christos Markou Date: Mon, 16 Sep 2024 12:41:58 +0300 Subject: [PATCH] [processor/resourcedetection] Move processor.resourcedetection.hostCPUSteppingAsString feature gate to stable (#35202) **Description:** Follows https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33076 and https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/31165. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/31136 **Testing:** **Documentation:** /cc @mx-psi Signed-off-by: ChrsMark --- .chloggen/cpu_stepping_fg_stable.yaml | 27 +++++++++++++++++++ .../internal/metadata/resource_int_version.go | 11 -------- .../internal/system/system.go | 19 ++++--------- 3 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 .chloggen/cpu_stepping_fg_stable.yaml delete mode 100644 processor/resourcedetectionprocessor/internal/system/internal/metadata/resource_int_version.go diff --git a/.chloggen/cpu_stepping_fg_stable.yaml b/.chloggen/cpu_stepping_fg_stable.yaml new file mode 100644 index 000000000000..19237453002c --- /dev/null +++ b/.chloggen/cpu_stepping_fg_stable.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: 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: [] diff --git a/processor/resourcedetectionprocessor/internal/system/internal/metadata/resource_int_version.go b/processor/resourcedetectionprocessor/internal/system/internal/metadata/resource_int_version.go deleted file mode 100644 index 6337c1e41421..000000000000 --- a/processor/resourcedetectionprocessor/internal/system/internal/metadata/resource_int_version.go +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package metadata // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/system/internal/metadata" - -// SetHostCPUSteppingAsInt sets provided value as "host.cpu.stepping" attribute as int. -func (rb *ResourceBuilder) SetHostCPUSteppingAsInt(val int64) { - if rb.config.HostCPUModelID.Enabled { - rb.res.Attributes().PutInt("host.cpu.stepping", val) - } -} diff --git a/processor/resourcedetectionprocessor/internal/system/system.go b/processor/resourcedetectionprocessor/internal/system/system.go index f3ff1c0c160a..45fc5c8607f2 100644 --- a/processor/resourcedetectionprocessor/internal/system/system.go +++ b/processor/resourcedetectionprocessor/internal/system/system.go @@ -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"), ) ) @@ -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)) }