adopt to the latest mdatagen changes

signalfx · Jul 31, 2023 · afd4aa8 · afd4aa8
1 parent a08e236
commit afd4aa8
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 17 deletions.
diff --git a/internal/receiver/databricksreceiver/factory.go b/internal/receiver/databricksreceiver/factory.go
@@ -58,6 +58,7 @@ func newReceiverFactory() receiver.CreateMetricsFunc {
 			rmp:             databricks.NewRunMetricsProvider(dbrsvc),
 			dbrmp:           databricks.MetricsProvider{Svc: dbrsvc},
 			metricsBuilder:  metadata.NewMetricsBuilder(dbrcfg.MetricsBuilderConfig, settings),
+			resourceBuilder: metadata.NewResourceBuilder(dbrcfg.MetricsBuilderConfig.ResourceAttributes),
 			scmb:            spark.ClusterMetricsBuilder{Ssvc: ssvc},
 			semb: spark.ExtraMetricsBuilder{
 				Ssvc:   ssvc,

diff --git a/internal/receiver/databricksreceiver/internal/metadata/generated_metrics.go b/internal/receiver/databricksreceiver/internal/metadata/generated_metrics.go
diff --git a/internal/receiver/databricksreceiver/internal/metadata/generated_resource.go b/internal/receiver/databricksreceiver/internal/metadata/generated_resource.go
diff --git a/internal/receiver/databricksreceiver/internal/metadata/generated_resource_test.go b/internal/receiver/databricksreceiver/internal/metadata/generated_resource_test.go
diff --git a/internal/receiver/databricksreceiver/internal/spark/cluster_metrics_builder_test.go b/internal/receiver/databricksreceiver/internal/spark/cluster_metrics_builder_test.go
@@ -24,6 +24,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pmetric"
 
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/commontest"
+	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/metadata"
 )
 
 func TestStripSparkMetricKey(t *testing.T) {
@@ -47,7 +48,8 @@ func TestClusterMetricsBuilder_GeneratedMetrics(t *testing.T) {
 	const expectedCount = 112
 
 	testBuilder := commontest.NewTestMetricsBuilder()
-	built := coreMetrics.Build(testBuilder, pcommon.NewTimestampFromTime(time.Now()))
+	rb := metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig())
+	built := coreMetrics.Build(testBuilder, rb, pcommon.NewTimestampFromTime(time.Now()), "my-app-id")
 	pm := pmetric.NewMetrics()
 	for _, metric := range built {
 		metric.ResourceMetrics().MoveAndAppendTo(pm.ResourceMetrics())

diff --git a/internal/receiver/databricksreceiver/internal/spark/extra_metrics_builder_test.go b/internal/receiver/databricksreceiver/internal/spark/extra_metrics_builder_test.go
@@ -24,6 +24,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/commontest"
+	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/metadata"
 )
 
 func TestSparkExtraMetricsBuilder_Executors(t *testing.T) {
@@ -32,7 +33,8 @@ func TestSparkExtraMetricsBuilder_Executors(t *testing.T) {
 	require.NoError(t, err)
 
 	builder := commontest.NewTestMetricsBuilder()
-	built := execMetrics.Build(builder, pcommon.NewTimestampFromTime(time.Now()))
+	rb := metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig())
+	built := execMetrics.Build(builder, rb, pcommon.NewTimestampFromTime(time.Now()), "my-app-id")
 	pm := pmetric.NewMetrics()
 	for _, metrics := range built {
 		metrics.ResourceMetrics().MoveAndAppendTo(pm.ResourceMetrics())
@@ -53,7 +55,8 @@ func TestSparkExtraMetricsBuilder_Jobs(t *testing.T) {
 	require.NoError(t, err)
 
 	builder := commontest.NewTestMetricsBuilder()
-	built := jobMetrics.Build(builder, pcommon.NewTimestampFromTime(time.Now()))
+	rb := metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig())
+	built := jobMetrics.Build(builder, rb, pcommon.NewTimestampFromTime(time.Now()), "my-app-id")
 	pm := pmetric.NewMetrics()
 	for _, metrics := range built {
 		metrics.ResourceMetrics().MoveAndAppendTo(pm.ResourceMetrics())
@@ -77,7 +80,8 @@ func TestSparkExtraMetricsBuilder_Stages(t *testing.T) {
 	require.NoError(t, err)
 
 	builder := commontest.NewTestMetricsBuilder()
-	built := stageMetrics.Build(builder, pcommon.NewTimestampFromTime(time.Now()))
+	rb := metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig())
+	built := stageMetrics.Build(builder, rb, pcommon.NewTimestampFromTime(time.Now()), "my-app-id")
 	pm := pmetric.NewMetrics()
 	for _, metrics := range built {
 		metrics.ResourceMetrics().MoveAndAppendTo(pm.ResourceMetrics())

diff --git a/internal/receiver/databricksreceiver/internal/spark/resource_metrics.go b/internal/receiver/databricksreceiver/internal/spark/resource_metrics.go
@@ -124,15 +124,16 @@ func (m *ResourceMetrics) addStageInfo(clstr Cluster, appID string, info StageIn
 	})
 }
 
-func (m *ResourceMetrics) Build(builder *metadata.MetricsBuilder, now pcommon.Timestamp, rmo ...metadata.ResourceMetricsOption) []pmetric.Metrics {
+func (m *ResourceMetrics) Build(mb *metadata.MetricsBuilder, rb *metadata.ResourceBuilder, now pcommon.Timestamp, instanceName string) []pmetric.Metrics {
 	var out []pmetric.Metrics
 	for rs, metricInfos := range m.m {
 		for _, mi := range metricInfos {
-			mi.build(builder, rs, now)
+			mi.build(mb, rs, now)
 		}
-		rmo = append(rmo, metadata.WithSparkClusterID(rs.cluster.ClusterID))
-		rmo = append(rmo, metadata.WithSparkClusterName(rs.cluster.ClusterName))
-		out = append(out, builder.Emit(rmo...))
+		rb.SetDatabricksInstanceName(instanceName)
+		rb.SetSparkClusterID(rs.cluster.ClusterID)
+		rb.SetSparkClusterName(rs.cluster.ClusterName)
+		out = append(out, mb.Emit(metadata.WithResource(rb.Emit())))
 	}
 	return out
 }

diff --git a/internal/receiver/databricksreceiver/internal/spark/resource_metrics_test.go b/internal/receiver/databricksreceiver/internal/spark/resource_metrics_test.go
@@ -23,6 +23,7 @@ import (
 	"go.opentelemetry.io/collector/pdata/pmetric"
 
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/commontest"
+	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/metadata"
 )
 
 func TestSparkDbrMetrics_Append(t *testing.T) {
@@ -45,8 +46,9 @@ func TestSparkDbrMetrics_Append(t *testing.T) {
 	})
 	outerRM.Append(rmSub2)
 
-	builder := commontest.NewTestMetricsBuilder()
-	built := outerRM.Build(builder, pcommon.NewTimestampFromTime(time.Now()))
+	mb := commontest.NewTestMetricsBuilder()
+	rb := metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig())
+	built := outerRM.Build(mb, rb, pcommon.NewTimestampFromTime(time.Now()), "my-app-id")
 	allMetrics := pmetric.NewMetrics()
 	for _, metrics := range built {
 		metrics.ResourceMetrics().CopyTo(allMetrics.ResourceMetrics())

diff --git a/internal/receiver/databricksreceiver/scraper.go b/internal/receiver/databricksreceiver/scraper.go
@@ -39,6 +39,7 @@ type scraper struct {
 	dbrsvc          databricks.Service
 	logger          *zap.Logger
 	metricsBuilder  *metadata.MetricsBuilder
+	resourceBuilder *metadata.ResourceBuilder
 	dbrInstanceName string
 }
 
@@ -60,7 +61,8 @@ func (s scraper) scrape(_ context.Context) (pmetric.Metrics, error) {
 		return pmetric.Metrics{}, fmt.Errorf("scrape failed to add multi job run metrics: %w", err)
 	}
 
-	dbrMetrics := s.metricsBuilder.Emit(metadata.WithDatabricksInstanceName(s.dbrInstanceName))
+	s.resourceBuilder.SetDatabricksInstanceName(s.dbrInstanceName)
+	dbrMetrics := s.metricsBuilder.Emit(metadata.WithResource(s.resourceBuilder.Emit()))
 
 	// spark metrics
 	clusters, err := s.dbrsvc.RunningClusters()
@@ -103,7 +105,7 @@ func (s scraper) scrape(_ context.Context) (pmetric.Metrics, error) {
 	out := pmetric.NewMetrics()
 	dbrMetrics.ResourceMetrics().MoveAndAppendTo(out.ResourceMetrics())
 
-	sparkMetrics := allSparkDbrMetrics.Build(s.metricsBuilder, now, metadata.WithDatabricksInstanceName(s.dbrInstanceName))
+	sparkMetrics := allSparkDbrMetrics.Build(s.metricsBuilder, s.resourceBuilder, now, s.dbrInstanceName)
 	for _, metric := range sparkMetrics {
 		metric.ResourceMetrics().MoveAndAppendTo(out.ResourceMetrics())
 	}

diff --git a/internal/receiver/databricksreceiver/scraper_test.go b/internal/receiver/databricksreceiver/scraper_test.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/commontest"
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/databricks"
+	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/metadata"
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/databricksreceiver/internal/spark"
 )
 
@@ -39,6 +40,7 @@ func TestScraper_Success(t *testing.T) {
 		logger:          nopLogger,
 		dbrInstanceName: "my-instance",
 		metricsBuilder:  commontest.NewTestMetricsBuilder(),
+		resourceBuilder: metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig()),
 		rmp:             databricks.NewRunMetricsProvider(dbrsvc),
 		dbrmp:           databricks.MetricsProvider{Svc: dbrsvc},
 		scmb:            spark.ClusterMetricsBuilder{Ssvc: ssvc},
@@ -71,6 +73,7 @@ func TestScraper_Forbidden(t *testing.T) {
 		logger:          nopLogger,
 		dbrInstanceName: "my-instance",
 		metricsBuilder:  commontest.NewTestMetricsBuilder(),
+		resourceBuilder: metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig()),
 		rmp:             databricks.NewRunMetricsProvider(dbrsvc),
 		dbrmp:           databricks.MetricsProvider{Svc: dbrsvc},
 		scmb:            spark.ClusterMetricsBuilder{Ssvc: ssvc},
@@ -94,6 +97,7 @@ func TestScraper_MultiCluster_Forbidden(t *testing.T) {
 		logger:          nopLogger,
 		dbrInstanceName: "my-instance",
 		metricsBuilder:  commontest.NewTestMetricsBuilder(),
+		resourceBuilder: metadata.NewResourceBuilder(metadata.DefaultResourceAttributesConfig()),
 		rmp:             databricks.NewRunMetricsProvider(dbrsvc),
 		dbrmp:           databricks.MetricsProvider{Svc: dbrsvc},
 		scmb:            spark.ClusterMetricsBuilder{Ssvc: ssvc},