From 50c065ac398dc62aac3436b5c285d1bfa6709394 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 15 Jun 2023 19:25:20 -0700 Subject: [PATCH] [receiver/k8s_cluster] Move statefulset metrics to use pdata (#23420) --- .chloggen/switchk8sss.yaml | 11 + .../internal/collection/collector.go | 2 +- .../internal/statefulset/doc.go | 6 + .../internal/statefulset/documentation.md | 54 +++ .../internal/metadata/generated_config.go | 92 +++++ .../metadata/generated_config_test.go | 78 ++++ .../internal/metadata/generated_metrics.go | 386 ++++++++++++++++++ .../metadata/generated_metrics_test.go | 178 ++++++++ .../internal/metadata/testdata/config.yaml | 39 ++ .../internal/statefulset/metadata.yaml | 53 +++ .../internal/statefulset/statefulsets.go | 95 +---- .../internal/statefulset/statefulsets_test.go | 45 +- 12 files changed, 935 insertions(+), 104 deletions(-) create mode 100755 .chloggen/switchk8sss.yaml create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/doc.go create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/documentation.md create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config.go create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config_test.go create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics.go create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics_test.go create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/testdata/config.yaml create mode 100644 receiver/k8sclusterreceiver/internal/statefulset/metadata.yaml diff --git a/.chloggen/switchk8sss.yaml b/.chloggen/switchk8sss.yaml new file mode 100755 index 000000000000..ba7f0527c6df --- /dev/null +++ b/.chloggen/switchk8sss.yaml @@ -0,0 +1,11 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: k8sclusterreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Switch k8s.ss metrics to use pdata. + +# One or more tracking issues related to the change +issues: [23420] diff --git a/receiver/k8sclusterreceiver/internal/collection/collector.go b/receiver/k8sclusterreceiver/internal/collection/collector.go index 73c603de3469..19a06d1d79b9 100644 --- a/receiver/k8sclusterreceiver/internal/collection/collector.go +++ b/receiver/k8sclusterreceiver/internal/collection/collector.go @@ -120,7 +120,7 @@ func (dc *DataCollector) SyncMetrics(obj interface{}) { case *appsv1.DaemonSet: md = ocsToMetrics(demonset.GetMetrics(o)) case *appsv1.StatefulSet: - md = ocsToMetrics(statefulset.GetMetrics(o)) + md = statefulset.GetMetrics(dc.settings, o) case *batchv1.Job: md = ocsToMetrics(jobs.GetMetrics(o)) case *batchv1.CronJob: diff --git a/receiver/k8sclusterreceiver/internal/statefulset/doc.go b/receiver/k8sclusterreceiver/internal/statefulset/doc.go new file mode 100644 index 000000000000..3354f9cd6748 --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/doc.go @@ -0,0 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:generate mdatagen metadata.yaml + +package statefulset // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/statefulset" diff --git a/receiver/k8sclusterreceiver/internal/statefulset/documentation.md b/receiver/k8sclusterreceiver/internal/statefulset/documentation.md new file mode 100644 index 000000000000..e0a6e9c082dd --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/documentation.md @@ -0,0 +1,54 @@ +[comment]: <> (Code generated by mdatagen. DO NOT EDIT.) + +# k8s/statefulset + +## Default Metrics + +The following metrics are emitted by default. Each of them can be disabled by applying the following configuration: + +```yaml +metrics: + : + enabled: false +``` + +### k8s.statefulset.current_pods + +The number of pods created by the StatefulSet controller from the StatefulSet version + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + +### k8s.statefulset.desired_pods + +Number of desired pods in the stateful set (the `spec.replicas` field) + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + +### k8s.statefulset.ready_pods + +Number of pods created by the stateful set that have the `Ready` condition + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + +### k8s.statefulset.updated_pods + +Number of pods created by the StatefulSet controller from the StatefulSet version + +| Unit | Metric Type | Value Type | +| ---- | ----------- | ---------- | +| 1 | Gauge | Int | + +## Resource Attributes + +| Name | Description | Values | Enabled | +| ---- | ----------- | ------ | ------- | +| k8s.namespace.name | The name of the namespace that the pod is running in. | Any Str | true | +| k8s.statefulset.name | The k8s statefulset name. | Any Str | true | +| k8s.statefulset.uid | The k8s statefulset uid. | Any Str | true | +| opencensus.resourcetype | The OpenCensus resource type. | Any Str | true | diff --git a/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config.go b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config.go new file mode 100644 index 000000000000..62ad78f9fd76 --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config.go @@ -0,0 +1,92 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import "go.opentelemetry.io/collector/confmap" + +// MetricConfig provides common config for a particular metric. +type MetricConfig struct { + Enabled bool `mapstructure:"enabled"` + + enabledSetByUser bool +} + +func (ms *MetricConfig) Unmarshal(parser *confmap.Conf) error { + if parser == nil { + return nil + } + err := parser.Unmarshal(ms, confmap.WithErrorUnused()) + if err != nil { + return err + } + ms.enabledSetByUser = parser.IsSet("enabled") + return nil +} + +// MetricsConfig provides config for k8s/statefulset metrics. +type MetricsConfig struct { + K8sStatefulsetCurrentPods MetricConfig `mapstructure:"k8s.statefulset.current_pods"` + K8sStatefulsetDesiredPods MetricConfig `mapstructure:"k8s.statefulset.desired_pods"` + K8sStatefulsetReadyPods MetricConfig `mapstructure:"k8s.statefulset.ready_pods"` + K8sStatefulsetUpdatedPods MetricConfig `mapstructure:"k8s.statefulset.updated_pods"` +} + +func DefaultMetricsConfig() MetricsConfig { + return MetricsConfig{ + K8sStatefulsetCurrentPods: MetricConfig{ + Enabled: true, + }, + K8sStatefulsetDesiredPods: MetricConfig{ + Enabled: true, + }, + K8sStatefulsetReadyPods: MetricConfig{ + Enabled: true, + }, + K8sStatefulsetUpdatedPods: MetricConfig{ + Enabled: true, + }, + } +} + +// ResourceAttributeConfig provides common config for a particular resource attribute. +type ResourceAttributeConfig struct { + Enabled bool `mapstructure:"enabled"` +} + +// ResourceAttributesConfig provides config for k8s/statefulset resource attributes. +type ResourceAttributesConfig struct { + K8sNamespaceName ResourceAttributeConfig `mapstructure:"k8s.namespace.name"` + K8sStatefulsetName ResourceAttributeConfig `mapstructure:"k8s.statefulset.name"` + K8sStatefulsetUID ResourceAttributeConfig `mapstructure:"k8s.statefulset.uid"` + OpencensusResourcetype ResourceAttributeConfig `mapstructure:"opencensus.resourcetype"` +} + +func DefaultResourceAttributesConfig() ResourceAttributesConfig { + return ResourceAttributesConfig{ + K8sNamespaceName: ResourceAttributeConfig{ + Enabled: true, + }, + K8sStatefulsetName: ResourceAttributeConfig{ + Enabled: true, + }, + K8sStatefulsetUID: ResourceAttributeConfig{ + Enabled: true, + }, + OpencensusResourcetype: ResourceAttributeConfig{ + Enabled: true, + }, + } +} + +// MetricsBuilderConfig is a configuration for k8s/statefulset metrics builder. +type MetricsBuilderConfig struct { + Metrics MetricsConfig `mapstructure:"metrics"` + ResourceAttributes ResourceAttributesConfig `mapstructure:"resource_attributes"` +} + +func DefaultMetricsBuilderConfig() MetricsBuilderConfig { + return MetricsBuilderConfig{ + Metrics: DefaultMetricsConfig(), + ResourceAttributes: DefaultResourceAttributesConfig(), + } +} diff --git a/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config_test.go b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config_test.go new file mode 100644 index 000000000000..15440502a191 --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_config_test.go @@ -0,0 +1,78 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "path/filepath" + "testing" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/confmaptest" +) + +func TestMetricsBuilderConfig(t *testing.T) { + tests := []struct { + name string + want MetricsBuilderConfig + }{ + { + name: "default", + want: DefaultMetricsBuilderConfig(), + }, + { + name: "all_set", + want: MetricsBuilderConfig{ + Metrics: MetricsConfig{ + K8sStatefulsetCurrentPods: MetricConfig{Enabled: true}, + K8sStatefulsetDesiredPods: MetricConfig{Enabled: true}, + K8sStatefulsetReadyPods: MetricConfig{Enabled: true}, + K8sStatefulsetUpdatedPods: MetricConfig{Enabled: true}, + }, + ResourceAttributes: ResourceAttributesConfig{ + K8sNamespaceName: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: true}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: true}, + OpencensusResourcetype: ResourceAttributeConfig{Enabled: true}, + }, + }, + }, + { + name: "none_set", + want: MetricsBuilderConfig{ + Metrics: MetricsConfig{ + K8sStatefulsetCurrentPods: MetricConfig{Enabled: false}, + K8sStatefulsetDesiredPods: MetricConfig{Enabled: false}, + K8sStatefulsetReadyPods: MetricConfig{Enabled: false}, + K8sStatefulsetUpdatedPods: MetricConfig{Enabled: false}, + }, + ResourceAttributes: ResourceAttributesConfig{ + K8sNamespaceName: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetName: ResourceAttributeConfig{Enabled: false}, + K8sStatefulsetUID: ResourceAttributeConfig{Enabled: false}, + OpencensusResourcetype: ResourceAttributeConfig{Enabled: false}, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cfg := loadMetricsBuilderConfig(t, tt.name) + if diff := cmp.Diff(tt.want, cfg, cmpopts.IgnoreUnexported(MetricConfig{}, ResourceAttributeConfig{})); diff != "" { + t.Errorf("Config mismatch (-expected +actual):\n%s", diff) + } + }) + } +} + +func loadMetricsBuilderConfig(t *testing.T, name string) MetricsBuilderConfig { + cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) + require.NoError(t, err) + sub, err := cm.Sub(name) + require.NoError(t, err) + cfg := DefaultMetricsBuilderConfig() + require.NoError(t, component.UnmarshalConfig(sub, &cfg)) + return cfg +} diff --git a/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics.go b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics.go new file mode 100644 index 000000000000..161cc58eb74d --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics.go @@ -0,0 +1,386 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "time" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" + conventions "go.opentelemetry.io/collector/semconv/v1.18.0" +) + +type metricK8sStatefulsetCurrentPods struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.statefulset.current_pods metric with initial data. +func (m *metricK8sStatefulsetCurrentPods) init() { + m.data.SetName("k8s.statefulset.current_pods") + m.data.SetDescription("The number of pods created by the StatefulSet controller from the StatefulSet version") + m.data.SetUnit("1") + m.data.SetEmptyGauge() +} + +func (m *metricK8sStatefulsetCurrentPods) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Gauge().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sStatefulsetCurrentPods) updateCapacity() { + if m.data.Gauge().DataPoints().Len() > m.capacity { + m.capacity = m.data.Gauge().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sStatefulsetCurrentPods) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sStatefulsetCurrentPods(cfg MetricConfig) metricK8sStatefulsetCurrentPods { + m := metricK8sStatefulsetCurrentPods{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + +type metricK8sStatefulsetDesiredPods struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.statefulset.desired_pods metric with initial data. +func (m *metricK8sStatefulsetDesiredPods) init() { + m.data.SetName("k8s.statefulset.desired_pods") + m.data.SetDescription("Number of desired pods in the stateful set (the `spec.replicas` field)") + m.data.SetUnit("1") + m.data.SetEmptyGauge() +} + +func (m *metricK8sStatefulsetDesiredPods) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Gauge().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sStatefulsetDesiredPods) updateCapacity() { + if m.data.Gauge().DataPoints().Len() > m.capacity { + m.capacity = m.data.Gauge().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sStatefulsetDesiredPods) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sStatefulsetDesiredPods(cfg MetricConfig) metricK8sStatefulsetDesiredPods { + m := metricK8sStatefulsetDesiredPods{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + +type metricK8sStatefulsetReadyPods struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.statefulset.ready_pods metric with initial data. +func (m *metricK8sStatefulsetReadyPods) init() { + m.data.SetName("k8s.statefulset.ready_pods") + m.data.SetDescription("Number of pods created by the stateful set that have the `Ready` condition") + m.data.SetUnit("1") + m.data.SetEmptyGauge() +} + +func (m *metricK8sStatefulsetReadyPods) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Gauge().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sStatefulsetReadyPods) updateCapacity() { + if m.data.Gauge().DataPoints().Len() > m.capacity { + m.capacity = m.data.Gauge().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sStatefulsetReadyPods) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sStatefulsetReadyPods(cfg MetricConfig) metricK8sStatefulsetReadyPods { + m := metricK8sStatefulsetReadyPods{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + +type metricK8sStatefulsetUpdatedPods struct { + data pmetric.Metric // data buffer for generated metric. + config MetricConfig // metric config provided by user. + capacity int // max observed number of data points added to the metric. +} + +// init fills k8s.statefulset.updated_pods metric with initial data. +func (m *metricK8sStatefulsetUpdatedPods) init() { + m.data.SetName("k8s.statefulset.updated_pods") + m.data.SetDescription("Number of pods created by the StatefulSet controller from the StatefulSet version") + m.data.SetUnit("1") + m.data.SetEmptyGauge() +} + +func (m *metricK8sStatefulsetUpdatedPods) recordDataPoint(start pcommon.Timestamp, ts pcommon.Timestamp, val int64) { + if !m.config.Enabled { + return + } + dp := m.data.Gauge().DataPoints().AppendEmpty() + dp.SetStartTimestamp(start) + dp.SetTimestamp(ts) + dp.SetIntValue(val) +} + +// updateCapacity saves max length of data point slices that will be used for the slice capacity. +func (m *metricK8sStatefulsetUpdatedPods) updateCapacity() { + if m.data.Gauge().DataPoints().Len() > m.capacity { + m.capacity = m.data.Gauge().DataPoints().Len() + } +} + +// emit appends recorded metric data to a metrics slice and prepares it for recording another set of data points. +func (m *metricK8sStatefulsetUpdatedPods) emit(metrics pmetric.MetricSlice) { + if m.config.Enabled && m.data.Gauge().DataPoints().Len() > 0 { + m.updateCapacity() + m.data.MoveTo(metrics.AppendEmpty()) + m.init() + } +} + +func newMetricK8sStatefulsetUpdatedPods(cfg MetricConfig) metricK8sStatefulsetUpdatedPods { + m := metricK8sStatefulsetUpdatedPods{config: cfg} + if cfg.Enabled { + m.data = pmetric.NewMetric() + m.init() + } + return m +} + +// MetricsBuilder provides an interface for scrapers to report metrics while taking care of all the transformations +// required to produce metric representation defined in metadata and user config. +type MetricsBuilder struct { + startTime pcommon.Timestamp // start time that will be applied to all recorded data points. + metricsCapacity int // maximum observed number of metrics per resource. + resourceCapacity int // maximum observed number of resource attributes. + metricsBuffer pmetric.Metrics // accumulates metrics data before emitting. + buildInfo component.BuildInfo // contains version information + resourceAttributesConfig ResourceAttributesConfig + metricK8sStatefulsetCurrentPods metricK8sStatefulsetCurrentPods + metricK8sStatefulsetDesiredPods metricK8sStatefulsetDesiredPods + metricK8sStatefulsetReadyPods metricK8sStatefulsetReadyPods + metricK8sStatefulsetUpdatedPods metricK8sStatefulsetUpdatedPods +} + +// metricBuilderOption applies changes to default metrics builder. +type metricBuilderOption func(*MetricsBuilder) + +// WithStartTime sets startTime on the metrics builder. +func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { + return func(mb *MetricsBuilder) { + mb.startTime = startTime + } +} + +func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSettings, options ...metricBuilderOption) *MetricsBuilder { + mb := &MetricsBuilder{ + startTime: pcommon.NewTimestampFromTime(time.Now()), + metricsBuffer: pmetric.NewMetrics(), + buildInfo: settings.BuildInfo, + resourceAttributesConfig: mbc.ResourceAttributes, + metricK8sStatefulsetCurrentPods: newMetricK8sStatefulsetCurrentPods(mbc.Metrics.K8sStatefulsetCurrentPods), + metricK8sStatefulsetDesiredPods: newMetricK8sStatefulsetDesiredPods(mbc.Metrics.K8sStatefulsetDesiredPods), + metricK8sStatefulsetReadyPods: newMetricK8sStatefulsetReadyPods(mbc.Metrics.K8sStatefulsetReadyPods), + metricK8sStatefulsetUpdatedPods: newMetricK8sStatefulsetUpdatedPods(mbc.Metrics.K8sStatefulsetUpdatedPods), + } + for _, op := range options { + op(mb) + } + return mb +} + +// updateCapacity updates max length of metrics and resource attributes that will be used for the slice capacity. +func (mb *MetricsBuilder) updateCapacity(rm pmetric.ResourceMetrics) { + if mb.metricsCapacity < rm.ScopeMetrics().At(0).Metrics().Len() { + mb.metricsCapacity = rm.ScopeMetrics().At(0).Metrics().Len() + } + if mb.resourceCapacity < rm.Resource().Attributes().Len() { + mb.resourceCapacity = rm.Resource().Attributes().Len() + } +} + +// ResourceMetricsOption applies changes to provided resource metrics. +type ResourceMetricsOption func(ResourceAttributesConfig, pmetric.ResourceMetrics) + +// WithK8sNamespaceName sets provided value as "k8s.namespace.name" attribute for current resource. +func WithK8sNamespaceName(val string) ResourceMetricsOption { + return func(rac ResourceAttributesConfig, rm pmetric.ResourceMetrics) { + if rac.K8sNamespaceName.Enabled { + rm.Resource().Attributes().PutStr("k8s.namespace.name", val) + } + } +} + +// WithK8sStatefulsetName sets provided value as "k8s.statefulset.name" attribute for current resource. +func WithK8sStatefulsetName(val string) ResourceMetricsOption { + return func(rac ResourceAttributesConfig, rm pmetric.ResourceMetrics) { + if rac.K8sStatefulsetName.Enabled { + rm.Resource().Attributes().PutStr("k8s.statefulset.name", val) + } + } +} + +// WithK8sStatefulsetUID sets provided value as "k8s.statefulset.uid" attribute for current resource. +func WithK8sStatefulsetUID(val string) ResourceMetricsOption { + return func(rac ResourceAttributesConfig, rm pmetric.ResourceMetrics) { + if rac.K8sStatefulsetUID.Enabled { + rm.Resource().Attributes().PutStr("k8s.statefulset.uid", val) + } + } +} + +// WithOpencensusResourcetype sets provided value as "opencensus.resourcetype" attribute for current resource. +func WithOpencensusResourcetype(val string) ResourceMetricsOption { + return func(rac ResourceAttributesConfig, rm pmetric.ResourceMetrics) { + if rac.OpencensusResourcetype.Enabled { + rm.Resource().Attributes().PutStr("opencensus.resourcetype", val) + } + } +} + +// WithStartTimeOverride overrides start time for all the resource metrics data points. +// This option should be only used if different start time has to be set on metrics coming from different resources. +func WithStartTimeOverride(start pcommon.Timestamp) ResourceMetricsOption { + return func(_ ResourceAttributesConfig, rm pmetric.ResourceMetrics) { + var dps pmetric.NumberDataPointSlice + metrics := rm.ScopeMetrics().At(0).Metrics() + for i := 0; i < metrics.Len(); i++ { + switch metrics.At(i).Type() { + case pmetric.MetricTypeGauge: + dps = metrics.At(i).Gauge().DataPoints() + case pmetric.MetricTypeSum: + dps = metrics.At(i).Sum().DataPoints() + } + for j := 0; j < dps.Len(); j++ { + dps.At(j).SetStartTimestamp(start) + } + } + } +} + +// EmitForResource saves all the generated metrics under a new resource and updates the internal state to be ready for +// recording another set of data points as part of another resource. This function can be helpful when one scraper +// needs to emit metrics from several resources. Otherwise calling this function is not required, +// just `Emit` function can be called instead. +// Resource attributes should be provided as ResourceMetricsOption arguments. +func (mb *MetricsBuilder) EmitForResource(rmo ...ResourceMetricsOption) { + rm := pmetric.NewResourceMetrics() + rm.SetSchemaUrl(conventions.SchemaURL) + rm.Resource().Attributes().EnsureCapacity(mb.resourceCapacity) + ils := rm.ScopeMetrics().AppendEmpty() + ils.Scope().SetName("otelcol/k8sclusterreceiver") + ils.Scope().SetVersion(mb.buildInfo.Version) + ils.Metrics().EnsureCapacity(mb.metricsCapacity) + mb.metricK8sStatefulsetCurrentPods.emit(ils.Metrics()) + mb.metricK8sStatefulsetDesiredPods.emit(ils.Metrics()) + mb.metricK8sStatefulsetReadyPods.emit(ils.Metrics()) + mb.metricK8sStatefulsetUpdatedPods.emit(ils.Metrics()) + + for _, op := range rmo { + op(mb.resourceAttributesConfig, rm) + } + if ils.Metrics().Len() > 0 { + mb.updateCapacity(rm) + rm.MoveTo(mb.metricsBuffer.ResourceMetrics().AppendEmpty()) + } +} + +// Emit returns all the metrics accumulated by the metrics builder and updates the internal state to be ready for +// recording another set of metrics. This function will be responsible for applying all the transformations required to +// produce metric representation defined in metadata and user config, e.g. delta or cumulative. +func (mb *MetricsBuilder) Emit(rmo ...ResourceMetricsOption) pmetric.Metrics { + mb.EmitForResource(rmo...) + metrics := mb.metricsBuffer + mb.metricsBuffer = pmetric.NewMetrics() + return metrics +} + +// RecordK8sStatefulsetCurrentPodsDataPoint adds a data point to k8s.statefulset.current_pods metric. +func (mb *MetricsBuilder) RecordK8sStatefulsetCurrentPodsDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sStatefulsetCurrentPods.recordDataPoint(mb.startTime, ts, val) +} + +// RecordK8sStatefulsetDesiredPodsDataPoint adds a data point to k8s.statefulset.desired_pods metric. +func (mb *MetricsBuilder) RecordK8sStatefulsetDesiredPodsDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sStatefulsetDesiredPods.recordDataPoint(mb.startTime, ts, val) +} + +// RecordK8sStatefulsetReadyPodsDataPoint adds a data point to k8s.statefulset.ready_pods metric. +func (mb *MetricsBuilder) RecordK8sStatefulsetReadyPodsDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sStatefulsetReadyPods.recordDataPoint(mb.startTime, ts, val) +} + +// RecordK8sStatefulsetUpdatedPodsDataPoint adds a data point to k8s.statefulset.updated_pods metric. +func (mb *MetricsBuilder) RecordK8sStatefulsetUpdatedPodsDataPoint(ts pcommon.Timestamp, val int64) { + mb.metricK8sStatefulsetUpdatedPods.recordDataPoint(mb.startTime, ts, val) +} + +// Reset resets metrics builder to its initial state. It should be used when external metrics source is restarted, +// and metrics builder should update its startTime and reset it's internal state accordingly. +func (mb *MetricsBuilder) Reset(options ...metricBuilderOption) { + mb.startTime = pcommon.NewTimestampFromTime(time.Now()) + for _, op := range options { + op(mb) + } +} diff --git a/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics_test.go b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics_test.go new file mode 100644 index 000000000000..9d3b9960a7e8 --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/generated_metrics_test.go @@ -0,0 +1,178 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver/receivertest" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" +) + +type testConfigCollection int + +const ( + testSetDefault testConfigCollection = iota + testSetAll + testSetNone +) + +func TestMetricsBuilder(t *testing.T) { + tests := []struct { + name string + configSet testConfigCollection + }{ + { + name: "default", + configSet: testSetDefault, + }, + { + name: "all_set", + configSet: testSetAll, + }, + { + name: "none_set", + configSet: testSetNone, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + start := pcommon.Timestamp(1_000_000_000) + ts := pcommon.Timestamp(1_000_001_000) + observedZapCore, observedLogs := observer.New(zap.WarnLevel) + settings := receivertest.NewNopCreateSettings() + settings.Logger = zap.New(observedZapCore) + mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, test.name), settings, WithStartTime(start)) + + expectedWarnings := 0 + assert.Equal(t, expectedWarnings, observedLogs.Len()) + + defaultMetricsCount := 0 + allMetricsCount := 0 + + defaultMetricsCount++ + allMetricsCount++ + mb.RecordK8sStatefulsetCurrentPodsDataPoint(ts, 1) + + defaultMetricsCount++ + allMetricsCount++ + mb.RecordK8sStatefulsetDesiredPodsDataPoint(ts, 1) + + defaultMetricsCount++ + allMetricsCount++ + mb.RecordK8sStatefulsetReadyPodsDataPoint(ts, 1) + + defaultMetricsCount++ + allMetricsCount++ + mb.RecordK8sStatefulsetUpdatedPodsDataPoint(ts, 1) + + metrics := mb.Emit(WithK8sNamespaceName("attr-val"), WithK8sStatefulsetName("attr-val"), WithK8sStatefulsetUID("attr-val"), WithOpencensusResourcetype("attr-val")) + + if test.configSet == testSetNone { + assert.Equal(t, 0, metrics.ResourceMetrics().Len()) + return + } + + assert.Equal(t, 1, metrics.ResourceMetrics().Len()) + rm := metrics.ResourceMetrics().At(0) + attrCount := 0 + enabledAttrCount := 0 + attrVal, ok := rm.Resource().Attributes().Get("k8s.namespace.name") + attrCount++ + assert.Equal(t, mb.resourceAttributesConfig.K8sNamespaceName.Enabled, ok) + if mb.resourceAttributesConfig.K8sNamespaceName.Enabled { + enabledAttrCount++ + assert.EqualValues(t, "attr-val", attrVal.Str()) + } + attrVal, ok = rm.Resource().Attributes().Get("k8s.statefulset.name") + attrCount++ + assert.Equal(t, mb.resourceAttributesConfig.K8sStatefulsetName.Enabled, ok) + if mb.resourceAttributesConfig.K8sStatefulsetName.Enabled { + enabledAttrCount++ + assert.EqualValues(t, "attr-val", attrVal.Str()) + } + attrVal, ok = rm.Resource().Attributes().Get("k8s.statefulset.uid") + attrCount++ + assert.Equal(t, mb.resourceAttributesConfig.K8sStatefulsetUID.Enabled, ok) + if mb.resourceAttributesConfig.K8sStatefulsetUID.Enabled { + enabledAttrCount++ + assert.EqualValues(t, "attr-val", attrVal.Str()) + } + attrVal, ok = rm.Resource().Attributes().Get("opencensus.resourcetype") + attrCount++ + assert.Equal(t, mb.resourceAttributesConfig.OpencensusResourcetype.Enabled, ok) + if mb.resourceAttributesConfig.OpencensusResourcetype.Enabled { + enabledAttrCount++ + assert.EqualValues(t, "attr-val", attrVal.Str()) + } + assert.Equal(t, enabledAttrCount, rm.Resource().Attributes().Len()) + assert.Equal(t, attrCount, 4) + + assert.Equal(t, 1, rm.ScopeMetrics().Len()) + ms := rm.ScopeMetrics().At(0).Metrics() + if test.configSet == testSetDefault { + assert.Equal(t, defaultMetricsCount, ms.Len()) + } + if test.configSet == testSetAll { + assert.Equal(t, allMetricsCount, ms.Len()) + } + validatedMetrics := make(map[string]bool) + for i := 0; i < ms.Len(); i++ { + switch ms.At(i).Name() { + case "k8s.statefulset.current_pods": + assert.False(t, validatedMetrics["k8s.statefulset.current_pods"], "Found a duplicate in the metrics slice: k8s.statefulset.current_pods") + validatedMetrics["k8s.statefulset.current_pods"] = true + assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) + assert.Equal(t, "The number of pods created by the StatefulSet controller from the StatefulSet version", ms.At(i).Description()) + assert.Equal(t, "1", ms.At(i).Unit()) + dp := ms.At(i).Gauge().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) + case "k8s.statefulset.desired_pods": + assert.False(t, validatedMetrics["k8s.statefulset.desired_pods"], "Found a duplicate in the metrics slice: k8s.statefulset.desired_pods") + validatedMetrics["k8s.statefulset.desired_pods"] = true + assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) + assert.Equal(t, "Number of desired pods in the stateful set (the `spec.replicas` field)", ms.At(i).Description()) + assert.Equal(t, "1", ms.At(i).Unit()) + dp := ms.At(i).Gauge().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) + case "k8s.statefulset.ready_pods": + assert.False(t, validatedMetrics["k8s.statefulset.ready_pods"], "Found a duplicate in the metrics slice: k8s.statefulset.ready_pods") + validatedMetrics["k8s.statefulset.ready_pods"] = true + assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) + assert.Equal(t, "Number of pods created by the stateful set that have the `Ready` condition", ms.At(i).Description()) + assert.Equal(t, "1", ms.At(i).Unit()) + dp := ms.At(i).Gauge().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) + case "k8s.statefulset.updated_pods": + assert.False(t, validatedMetrics["k8s.statefulset.updated_pods"], "Found a duplicate in the metrics slice: k8s.statefulset.updated_pods") + validatedMetrics["k8s.statefulset.updated_pods"] = true + assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) + assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) + assert.Equal(t, "Number of pods created by the StatefulSet controller from the StatefulSet version", ms.At(i).Description()) + assert.Equal(t, "1", ms.At(i).Unit()) + dp := ms.At(i).Gauge().DataPoints().At(0) + assert.Equal(t, start, dp.StartTimestamp()) + assert.Equal(t, ts, dp.Timestamp()) + assert.Equal(t, pmetric.NumberDataPointValueTypeInt, dp.ValueType()) + assert.Equal(t, int64(1), dp.IntValue()) + } + } + }) + } +} diff --git a/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/testdata/config.yaml b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/testdata/config.yaml new file mode 100644 index 000000000000..9837c9fcc8ab --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata/testdata/config.yaml @@ -0,0 +1,39 @@ +default: +all_set: + metrics: + k8s.statefulset.current_pods: + enabled: true + k8s.statefulset.desired_pods: + enabled: true + k8s.statefulset.ready_pods: + enabled: true + k8s.statefulset.updated_pods: + enabled: true + resource_attributes: + k8s.namespace.name: + enabled: true + k8s.statefulset.name: + enabled: true + k8s.statefulset.uid: + enabled: true + opencensus.resourcetype: + enabled: true +none_set: + metrics: + k8s.statefulset.current_pods: + enabled: false + k8s.statefulset.desired_pods: + enabled: false + k8s.statefulset.ready_pods: + enabled: false + k8s.statefulset.updated_pods: + enabled: false + resource_attributes: + k8s.namespace.name: + enabled: false + k8s.statefulset.name: + enabled: false + k8s.statefulset.uid: + enabled: false + opencensus.resourcetype: + enabled: false diff --git a/receiver/k8sclusterreceiver/internal/statefulset/metadata.yaml b/receiver/k8sclusterreceiver/internal/statefulset/metadata.yaml new file mode 100644 index 000000000000..a1cc5349acae --- /dev/null +++ b/receiver/k8sclusterreceiver/internal/statefulset/metadata.yaml @@ -0,0 +1,53 @@ +type: k8s/statefulset + +sem_conv_version: 1.18.0 + +resource_attributes: + k8s.statefulset.uid: + description: The k8s statefulset uid. + type: string + enabled: true + + k8s.statefulset.name: + description: The k8s statefulset name. + type: string + enabled: true + + k8s.namespace.name: + description: The name of the namespace that the pod is running in. + type: string + enabled: true + + opencensus.resourcetype: + description: The OpenCensus resource type. + type: string + enabled: true + +metrics: + k8s.statefulset.desired_pods: + enabled: true + description: Number of desired pods in the stateful set (the `spec.replicas` field) + unit: 1 + gauge: + value_type: int + + k8s.statefulset.ready_pods: + enabled: true + description: Number of pods created by the stateful set that have the `Ready` condition + unit: 1 + gauge: + value_type: int + + k8s.statefulset.current_pods: + enabled: true + description: The number of pods created by the StatefulSet controller from the StatefulSet version + unit: 1 + gauge: + value_type: int + + k8s.statefulset.updated_pods: + enabled: true + description: Number of pods created by the StatefulSet controller from the StatefulSet version + unit: 1 + gauge: + value_type: int diff --git a/receiver/k8sclusterreceiver/internal/statefulset/statefulsets.go b/receiver/k8sclusterreceiver/internal/statefulset/statefulsets.go index 7b60324dadee..cf77e4279e3d 100644 --- a/receiver/k8sclusterreceiver/internal/statefulset/statefulsets.go +++ b/receiver/k8sclusterreceiver/internal/statefulset/statefulsets.go @@ -4,16 +4,17 @@ package statefulset // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/statefulset" import ( - agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - conventions "go.opentelemetry.io/collector/semconv/v1.6.1" + "time" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/receiver" appsv1 "k8s.io/api/apps/v1" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/constants" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/utils" + imetadata "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/statefulset/internal/metadata" ) const ( @@ -22,83 +23,17 @@ const ( statefulSetUpdateVersion = "update_revision" ) -var statefulSetReplicasDesiredMetric = &metricspb.MetricDescriptor{ - Name: "k8s.statefulset.desired_pods", - Description: "Number of desired pods in the stateful set (the `spec.replicas` field)", - Unit: "1", - Type: metricspb.MetricDescriptor_GAUGE_INT64, -} - -var statefulSetReplicasReadyMetric = &metricspb.MetricDescriptor{ - Name: "k8s.statefulset.ready_pods", - Description: "Number of pods created by the stateful set that have the `Ready` condition", - Unit: "1", - Type: metricspb.MetricDescriptor_GAUGE_INT64, -} - -var statefulSetReplicasCurrentMetric = &metricspb.MetricDescriptor{ - Name: "k8s.statefulset.current_pods", - Description: "The number of pods created by the StatefulSet controller from the StatefulSet version", - Unit: "1", - Type: metricspb.MetricDescriptor_GAUGE_INT64, -} - -var statefulSetReplicasUpdatedMetric = &metricspb.MetricDescriptor{ - Name: "k8s.statefulset.updated_pods", - Description: "Number of pods created by the StatefulSet controller from the StatefulSet version", - Unit: "1", - Type: metricspb.MetricDescriptor_GAUGE_INT64, -} - -func GetMetrics(ss *appsv1.StatefulSet) []*agentmetricspb.ExportMetricsServiceRequest { +func GetMetrics(set receiver.CreateSettings, ss *appsv1.StatefulSet) pmetric.Metrics { if ss.Spec.Replicas == nil { - return []*agentmetricspb.ExportMetricsServiceRequest{} - } - - metrics := []*metricspb.Metric{ - { - MetricDescriptor: statefulSetReplicasDesiredMetric, - Timeseries: []*metricspb.TimeSeries{ - utils.GetInt64TimeSeries(int64(*ss.Spec.Replicas)), - }, - }, - { - MetricDescriptor: statefulSetReplicasReadyMetric, - Timeseries: []*metricspb.TimeSeries{ - utils.GetInt64TimeSeries(int64(ss.Status.ReadyReplicas)), - }, - }, - { - MetricDescriptor: statefulSetReplicasCurrentMetric, - Timeseries: []*metricspb.TimeSeries{ - utils.GetInt64TimeSeries(int64(ss.Status.CurrentReplicas)), - }, - }, - { - MetricDescriptor: statefulSetReplicasUpdatedMetric, - Timeseries: []*metricspb.TimeSeries{ - utils.GetInt64TimeSeries(int64(ss.Status.UpdatedReplicas)), - }, - }, - } - - return []*agentmetricspb.ExportMetricsServiceRequest{ - { - Resource: getResource(ss), - Metrics: metrics, - }, - } -} - -func getResource(ss *appsv1.StatefulSet) *resourcepb.Resource { - return &resourcepb.Resource{ - Type: constants.K8sType, - Labels: map[string]string{ - conventions.AttributeK8SStatefulSetUID: string(ss.UID), - conventions.AttributeK8SStatefulSetName: ss.Name, - conventions.AttributeK8SNamespaceName: ss.Namespace, - }, + return pmetric.NewMetrics() } + mb := imetadata.NewMetricsBuilder(imetadata.DefaultMetricsBuilderConfig(), set) + ts := pcommon.NewTimestampFromTime(time.Now()) + mb.RecordK8sStatefulsetDesiredPodsDataPoint(ts, int64(*ss.Spec.Replicas)) + mb.RecordK8sStatefulsetReadyPodsDataPoint(ts, int64(ss.Status.ReadyReplicas)) + mb.RecordK8sStatefulsetCurrentPodsDataPoint(ts, int64(ss.Status.CurrentReplicas)) + mb.RecordK8sStatefulsetUpdatedPodsDataPoint(ts, int64(ss.Status.UpdatedReplicas)) + return mb.Emit(imetadata.WithK8sStatefulsetUID(string(ss.UID)), imetadata.WithK8sStatefulsetName(ss.Name), imetadata.WithK8sNamespaceName(ss.Namespace), imetadata.WithOpencensusResourcetype("k8s")) } func GetMetadata(ss *appsv1.StatefulSet) map[experimentalmetricmetadata.ResourceID]*metadata.KubernetesMetadata { diff --git a/receiver/k8sclusterreceiver/internal/statefulset/statefulsets_test.go b/receiver/k8sclusterreceiver/internal/statefulset/statefulsets_test.go index 44c1319fc7cc..2374f50e1753 100644 --- a/receiver/k8sclusterreceiver/internal/statefulset/statefulsets_test.go +++ b/receiver/k8sclusterreceiver/internal/statefulset/statefulsets_test.go @@ -6,45 +6,44 @@ package statefulset import ( "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/receiver/receivertest" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/constants" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/testutils" ) -func TestStatefulsettMetrics(t *testing.T) { +func TestStatefulsetMetrics(t *testing.T) { ss := newStatefulset("1") - actualResourceMetrics := GetMetrics(ss) + actualResourceMetrics := GetMetrics(receivertest.NewNopCreateSettings(), ss) - require.Equal(t, 1, len(actualResourceMetrics)) - require.Equal(t, 4, len(actualResourceMetrics[0].Metrics)) + require.Equal(t, 1, actualResourceMetrics.ResourceMetrics().Len()) + require.Equal(t, 4, actualResourceMetrics.MetricCount()) - rm := actualResourceMetrics[0] - testutils.AssertResource(t, rm.Resource, constants.K8sType, - map[string]string{ - "k8s.statefulset.uid": "test-statefulset-1-uid", - "k8s.statefulset.name": "test-statefulset-1", - "k8s.namespace.name": "test-namespace", - }, + rm := actualResourceMetrics.ResourceMetrics().At(0) + assert.Equal(t, + map[string]interface{}{ + "k8s.statefulset.uid": "test-statefulset-1-uid", + "k8s.statefulset.name": "test-statefulset-1", + "k8s.namespace.name": "test-namespace", + "opencensus.resourcetype": "k8s", + }, rm.Resource().Attributes().AsRaw(), ) - testutils.AssertMetricsInt(t, rm.Metrics[0], "k8s.statefulset.desired_pods", - metricspb.MetricDescriptor_GAUGE_INT64, 10) - - testutils.AssertMetricsInt(t, rm.Metrics[1], "k8s.statefulset.ready_pods", - metricspb.MetricDescriptor_GAUGE_INT64, 7) + m1 := rm.ScopeMetrics().At(0).Metrics().At(0) + assert.Equal(t, "k8s.statefulset.current_pods", m1.Name()) - testutils.AssertMetricsInt(t, rm.Metrics[2], "k8s.statefulset.current_pods", - metricspb.MetricDescriptor_GAUGE_INT64, 5) + m2 := rm.ScopeMetrics().At(0).Metrics().At(1) + assert.Equal(t, "k8s.statefulset.desired_pods", m2.Name()) - testutils.AssertMetricsInt(t, rm.Metrics[3], "k8s.statefulset.updated_pods", - metricspb.MetricDescriptor_GAUGE_INT64, 3) + m3 := rm.ScopeMetrics().At(0).Metrics().At(2) + assert.Equal(t, "k8s.statefulset.ready_pods", m3.Name()) + m4 := rm.ScopeMetrics().At(0).Metrics().At(3) + assert.Equal(t, "k8s.statefulset.updated_pods", m4.Name()) } func TestStatefulsetMetadata(t *testing.T) {