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

Jump to bottom

[receiver/k8scluster] Use newer v2 HorizontalPodAutoscaler for Kubern… #20483

Merged
merged 3 commits into from
Apr 7, 2023
Merged

[receiver/k8scluster] Use newer v2 HorizontalPodAutoscaler for Kubern… #20483

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715d6be
receiver/k8scluster] Use newer v2 HorizontalPodAutoscaler for Kuberne…
jvoravong Mar 29, 2023
5be612e
Update .chloggen/fix-k8scluster-use-v2-horizontalpodautoscaler.yaml
jvoravong Mar 30, 2023
631e27c
patch
jvoravong Mar 30, 2023
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
Prev Previous commit
patch
  • Loading branch information
@jvoravong
jvoravong committed Mar 30, 2023
commit 631e27c688693bae6007948c08f1f0dca2d36183
24 changes: 7 additions & 17 deletions receiver/k8sclusterreceiver/internal/hpa/hpa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
autoscalingv2 "k8s.io/api/autoscaling/v2"
autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/constants"
Expand Down Expand Up @@ -86,7 +87,7 @@ func GetMetrics(hpa *autoscalingv2.HorizontalPodAutoscaler) []*agentmetricspb.Ex

return []*agentmetricspb.ExportMetricsServiceRequest{
{
Resource: getResourceForHPA(hpa),
Resource: getResourceForHPA(&hpa.ObjectMeta),
Metrics: metrics,
},
}
Expand Down Expand Up @@ -122,30 +123,19 @@ func GetMetricsBeta(hpa *autoscalingv2beta2.HorizontalPodAutoscaler) []*agentmet

return []*agentmetricspb.ExportMetricsServiceRequest{
{
Resource: getResourceForHPABeta(hpa),
Resource: getResourceForHPA(&hpa.ObjectMeta),
Metrics: metrics,
},
}
}

func getResourceForHPA(hpa *autoscalingv2.HorizontalPodAutoscaler) *resourcepb.Resource {
func getResourceForHPA(om *v1.ObjectMeta) *resourcepb.Resource {
return &resourcepb.Resource{
Type: constants.K8sType,
Labels: map[string]string{
constants.K8sKeyHPAUID: string(hpa.UID),
constants.K8sKeyHPAName: hpa.Name,
conventions.AttributeK8SNamespaceName: hpa.Namespace,
},
}
}

func getResourceForHPABeta(hpa *autoscalingv2beta2.HorizontalPodAutoscaler) *resourcepb.Resource {
return &resourcepb.Resource{
Type: constants.K8sType,
Labels: map[string]string{
constants.K8sKeyHPAUID: string(hpa.UID),
constants.K8sKeyHPAName: hpa.Name,
conventions.AttributeK8SNamespaceName: hpa.Namespace,
constants.K8sKeyHPAUID: string(om.UID),
constants.K8sKeyHPAName: om.Name,
conventions.AttributeK8SNamespaceName: om.Namespace,
},
}
}
Expand Down