[chore] Migrate the "generate" make target to mdatagen from core repo

This change migrates `generate` make target from using deprecated cmd/mdatagen defined in this repo to mdategen defined in core repository. In order to avoid breaking changes for end users, we keep the scope names used in this repo the same as before. This required defining them explicitly in metadata.yaml files. We can update them after open-telemetry/opentelemetry-collector#9494 and #21469 are resolver. Taking the opportunity that that the scope names can be explicitly defined, this PR also updates missing scope names for extensions with inconsistent package names e.g.: awsproxy and jaegerremotesampling. It's not a breaking change because the generated meter and tracer are not being used yet.
open-telemetry · Mar 6, 2024 · 4abe78d · 4abe78d
1 parent 5b4e92a
commit 4abe78d
Show file tree

Hide file tree

Showing 224 changed files with 312 additions and 104 deletions.
diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ docker-telemetrygen:
 
 .PHONY: generate
 generate: install-tools
-	cd cmd/mdatagen && $(GOCMD) install .
+	cd ./internal/tools && go install go.opentelemetry.io/collector/cmd/mdatagen
 	$(MAKE) for-all CMD="$(GOCMD) generate ./..."
 
 .PHONY: mdatagen-test

diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go
diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_status.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_status.go
diff --git a/cmd/mdatagen/validate_test.go b/cmd/mdatagen/validate_test.go
@@ -4,12 +4,8 @@
 package main
 
 import (
-	"fmt"
-	"io/fs"
-	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -105,49 +101,3 @@ func TestValidate(t *testing.T) {
 		})
 	}
 }
-
-func TestValidateMetricDuplicates(t *testing.T) {
-	allowedMetrics := map[string][]string{
-		"container.cpu.utilization": {"docker_stats", "kubeletstats"},
-		"container.memory.rss":      {"docker_stats", "kubeletstats"},
-		"container.uptime":          {"docker_stats", "kubeletstats"},
-	}
-	allMetrics := map[string][]string{}
-	err := filepath.Walk("../../receiver", func(path string, info fs.FileInfo, err error) error {
-		if info.Name() == "metadata.yaml" {
-			md, err := loadMetadata(path)
-			require.NoError(t, err)
-			if len(md.Metrics) > 0 {
-				for metricName := range md.Metrics {
-					allMetrics[md.Type] = append(allMetrics[md.Type], string(metricName))
-				}
-			}
-		}
-		return nil
-	})
-	require.NoError(t, err)
-
-	seen := make(map[string]string)
-	for receiver, metrics := range allMetrics {
-		for _, metricName := range metrics {
-			if val, exists := seen[metricName]; exists {
-				receivers, allowed := allowedMetrics[metricName]
-				assert.True(
-					t,
-					allowed && contains(receiver, receivers) && contains(val, receivers),
-					fmt.Sprintf("Duplicate metric %v in receivers %v and %v. Please validate that this is intentional by adding the metric name and receiver types in the allowedMetrics map in this test\n", metricName, receiver, val),
-				)
-			}
-			seen[metricName] = receiver
-		}
-	}
-}
-
-func contains(r string, rs []string) bool {
-	for _, s := range rs {
-		if s == r {
-			return true
-		}
-	}
-	return false
-}
diff --git a/connector/countconnector/internal/metadata/generated_status.go b/connector/countconnector/internal/metadata/generated_status.go
diff --git a/connector/countconnector/metadata.yaml b/connector/countconnector/metadata.yaml
@@ -1,4 +1,5 @@
 type: count
+scope_name: otelcol/countconnector
 
 status:
   class: connector

diff --git a/connector/datadogconnector/metadata.yaml b/connector/datadogconnector/metadata.yaml
@@ -1,4 +1,5 @@
 type: datadog
+scope_name: otelcol/datadog
 
 status:
   class: connector

diff --git a/connector/exceptionsconnector/internal/metadata/generated_status.go b/connector/exceptionsconnector/internal/metadata/generated_status.go
diff --git a/connector/failoverconnector/metadata.yaml b/connector/failoverconnector/metadata.yaml
@@ -1,4 +1,5 @@
 type: failover
+scope_name: otelcol/failover
 
 status:
   class: connector

diff --git a/connector/routingconnector/metadata.yaml b/connector/routingconnector/metadata.yaml
@@ -1,4 +1,5 @@
 type: routing
+scope_name: otelcol/routing
 
 status:
   class: connector

diff --git a/connector/servicegraphconnector/internal/metadata/generated_status.go b/connector/servicegraphconnector/internal/metadata/generated_status.go
diff --git a/connector/spanmetricsconnector/metadata.yaml b/connector/spanmetricsconnector/metadata.yaml
@@ -1,4 +1,5 @@
 type: spanmetrics
+scope_name: otelcol/spanmetrics
 
 status:
   class: connector

diff --git a/exporter/alertmanagerexporter/metadata.yaml b/exporter/alertmanagerexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: alertmanager
+scope_name: otelcol/alertmanager
 
 status:
   class: exporter

diff --git a/exporter/alibabacloudlogserviceexporter/metadata.yaml b/exporter/alibabacloudlogserviceexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: alibabacloud_logservice
+scope_name: otelcol/alibabacloudlogservice
 
 status:
   class: exporter

diff --git a/exporter/awscloudwatchlogsexporter/metadata.yaml b/exporter/awscloudwatchlogsexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: awscloudwatchlogs
+scope_name: otelcol/awscloudwatchlogs
 
 status:
   class: exporter

diff --git a/exporter/awsemfexporter/metadata.yaml b/exporter/awsemfexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: awsemf
+scope_name: otelcol/awsemf
 
 status:
   class: exporter

diff --git a/exporter/awskinesisexporter/metadata.yaml b/exporter/awskinesisexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: awskinesis
+scope_name: otelcol/awskinesis
 
 status:
   class: exporter

diff --git a/exporter/awss3exporter/metadata.yaml b/exporter/awss3exporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: awss3
+scope_name: otelcol/awss3
 
 status:
   class: exporter

diff --git a/exporter/awsxrayexporter/metadata.yaml b/exporter/awsxrayexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: awsxray
+scope_name: otelcol/awsxray
 
 status:
   class: exporter

diff --git a/exporter/azuredataexplorerexporter/metadata.yaml b/exporter/azuredataexplorerexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: azuredataexplorer
+scope_name: otelcol/azuredataexplorer
 
 status:
   class: exporter

diff --git a/exporter/azuremonitorexporter/metadata.yaml b/exporter/azuremonitorexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: azuremonitor
+scope_name: otelcol/azuremonitor
 
 status:
   class: exporter

diff --git a/exporter/carbonexporter/metadata.yaml b/exporter/carbonexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: carbon
+scope_name: otelcol/carbon
 
 status:
   class: exporter

diff --git a/exporter/cassandraexporter/metadata.yaml b/exporter/cassandraexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: cassandra
+scope_name: otelcol/cassandra
 
 status:
   class: exporter

diff --git a/exporter/clickhouseexporter/metadata.yaml b/exporter/clickhouseexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: clickhouse
+scope_name: otelcol/clickhouse
 
 status:
   class: exporter

diff --git a/exporter/coralogixexporter/metadata.yaml b/exporter/coralogixexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: coralogix
+scope_name: otelcol/coralogix
 
 status:
   class: exporter

diff --git a/exporter/datadogexporter/metadata.yaml b/exporter/datadogexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: datadog
+scope_name: otelcol/datadog
 
 status:
   class: exporter

diff --git a/exporter/datasetexporter/metadata.yaml b/exporter/datasetexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: dataset
+scope_name: otelcol/dataset
 
 status:
   class: exporter

diff --git a/exporter/dynatraceexporter/metadata.yaml b/exporter/dynatraceexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: dynatrace
+scope_name: otelcol/dynatrace
 
 status:
   class: exporter

diff --git a/exporter/elasticsearchexporter/metadata.yaml b/exporter/elasticsearchexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: elasticsearch
+scope_name: otelcol/elasticsearch
 
 status:
   class: exporter

diff --git a/exporter/fileexporter/metadata.yaml b/exporter/fileexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: file
+scope_name: otelcol/file
 
 status:
   class: exporter

diff --git a/exporter/googlecloudexporter/metadata.yaml b/exporter/googlecloudexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: googlecloud
+scope_name: otelcol/googlecloud
 
 status:
   class: exporter

diff --git a/exporter/googlecloudpubsubexporter/metadata.yaml b/exporter/googlecloudpubsubexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: googlecloudpubsub
+scope_name: otelcol/googlecloudpubsub
 
 status:
   class: exporter

diff --git a/exporter/googlemanagedprometheusexporter/metadata.yaml b/exporter/googlemanagedprometheusexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: googlemanagedprometheus
+scope_name: otelcol/googlemanagedprometheus
 
 status:
   class: exporter

diff --git a/exporter/honeycombmarkerexporter/metadata.yaml b/exporter/honeycombmarkerexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: honeycombmarker
+scope_name: otelcol/honeycombmarker
 
 status:
   class: exporter

diff --git a/exporter/influxdbexporter/metadata.yaml b/exporter/influxdbexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: influxdb
+scope_name: otelcol/influxdb
 
 status:
   class: exporter

diff --git a/exporter/instanaexporter/metadata.yaml b/exporter/instanaexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: instana
+scope_name: otelcol/instana
 
 status:
   class: exporter

diff --git a/exporter/kafkaexporter/metadata.yaml b/exporter/kafkaexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: kafka
+scope_name: otelcol/kafka
 
 status:
   class: exporter

diff --git a/exporter/kineticaexporter/metadata.yaml b/exporter/kineticaexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: kinetica
+scope_name: otelcol/kinetica
 
 status:
   class: exporter

diff --git a/exporter/loadbalancingexporter/metadata.yaml b/exporter/loadbalancingexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: loadbalancing
+scope_name: otelcol/loadbalancing
 
 status:
   class: exporter

diff --git a/exporter/logicmonitorexporter/metadata.yaml b/exporter/logicmonitorexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: logicmonitor
+scope_name: otelcol/logicmonitor
 
 status:
   class: exporter

diff --git a/exporter/logzioexporter/metadata.yaml b/exporter/logzioexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: logzio
+scope_name: otelcol/logzio
 
 status:
   class: exporter

diff --git a/exporter/lokiexporter/metadata.yaml b/exporter/lokiexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: loki
+scope_name: otelcol/loki
 
 status:
   class: exporter

diff --git a/exporter/mezmoexporter/metadata.yaml b/exporter/mezmoexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: mezmo
+scope_name: otelcol/mezmo
 
 status:
   class: exporter

diff --git a/exporter/opencensusexporter/metadata.yaml b/exporter/opencensusexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: opencensus
+scope_name: otelcol/opencensus
 
 status:
   class: exporter

diff --git a/exporter/opensearchexporter/metadata.yaml b/exporter/opensearchexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: opensearch
+scope_name: otelcol/opensearch
 
 status:
   class: exporter

diff --git a/exporter/otelarrowexporter/metadata.yaml b/exporter/otelarrowexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: otelarrow
+scope_name: otelcol/otelarrow
 
 status:
   class: exporter

diff --git a/exporter/prometheusexporter/metadata.yaml b/exporter/prometheusexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: prometheus
+scope_name: otelcol/prometheus
 
 status:
   class: exporter

diff --git a/exporter/prometheusremotewriteexporter/metadata.yaml b/exporter/prometheusremotewriteexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: prometheusremotewrite
+scope_name: otelcol/prometheusremotewrite
 
 status:
   class: exporter

diff --git a/exporter/pulsarexporter/metadata.yaml b/exporter/pulsarexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: pulsar
+scope_name: otelcol/pulsar
 
 status:
   class: exporter

diff --git a/exporter/sapmexporter/metadata.yaml b/exporter/sapmexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: sapm
+scope_name: otelcol/sapm
 
 status:
   class: exporter

diff --git a/exporter/sentryexporter/metadata.yaml b/exporter/sentryexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: sentry
+scope_name: otelcol/sentry
 
 status:
   class: exporter

diff --git a/exporter/signalfxexporter/metadata.yaml b/exporter/signalfxexporter/metadata.yaml
@@ -1,4 +1,5 @@
 type: signalfx
+scope_name: otelcol/signalfx
 
 status:
   class: exporter