diff --git a/.chloggen/resourcedetectionprocessor_openshift_bump_semconv.yaml b/.chloggen/resourcedetectionprocessor_openshift_bump_semconv.yaml new file mode 100755 index 000000000000..efe26bee138f --- /dev/null +++ b/.chloggen/resourcedetectionprocessor_openshift_bump_semconv.yaml @@ -0,0 +1,16 @@ +# 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: Bump OpenShift semconv version from 1.16.0 to 1.18.0. + +# One or more tracking issues related to the change +issues: [19168] + +# (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: Rename google openshift platform attribute from google_cloud_openshift to gcp_openshift. diff --git a/processor/resourcedetectionprocessor/internal/openshift/openshift.go b/processor/resourcedetectionprocessor/internal/openshift/openshift.go index e47e93c794ea..20968b016caf 100644 --- a/processor/resourcedetectionprocessor/internal/openshift/openshift.go +++ b/processor/resourcedetectionprocessor/internal/openshift/openshift.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/processor" - conventions "go.opentelemetry.io/collector/semconv/v1.16.0" + conventions "go.opentelemetry.io/collector/semconv/v1.18.0" "go.uber.org/zap" ocp "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/openshift" @@ -84,7 +84,7 @@ func (d *detector) Detect(ctx context.Context) (resource pcommon.Resource, schem region = strings.ToLower(infra.Status.PlatformStatus.Azure.CloudName) case "gcp": provider = conventions.AttributeCloudProviderGCP - platform = conventions.AttributeCloudPlatformGoogleCloudOpenshift + platform = conventions.AttributeCloudPlatformGCPOpenshift region = strings.ToLower(infra.Status.PlatformStatus.GCP.Region) case "ibmcloud": provider = conventions.AttributeCloudProviderIbmCloud diff --git a/processor/resourcedetectionprocessor/internal/openshift/openshift_test.go b/processor/resourcedetectionprocessor/internal/openshift/openshift_test.go index 67ce9c4c7520..db3885618702 100644 --- a/processor/resourcedetectionprocessor/internal/openshift/openshift_test.go +++ b/processor/resourcedetectionprocessor/internal/openshift/openshift_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" - conventions "go.opentelemetry.io/collector/semconv/v1.16.0" + conventions "go.opentelemetry.io/collector/semconv/v1.18.0" "go.uber.org/zap/zaptest" ocp "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/openshift"