Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[processor/resourcedetectionprocessor] Bump OpenShift semconv from 1.16 to 1.18 #19169

Merged
merged 1 commit into from
Mar 7, 2023
Merged

[processor/resourcedetectionprocessor] Bump OpenShift semconv from 1.16 to 1.18 #19169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .chloggen/resourcedetectionprocessor_openshift_bump_semconv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions processor/resourcedetectionprocessor/internal/openshift/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion processor/resourcedetectionprocessor/internal/openshift/openshift_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down