Skip to content

Commit bde317d

Browse files
dmitryaxDougManton
dmitryax
authored and
DougManton
committed
[chore] Migrate the "generate" make target to mdatagen from core repo (open-telemetry#31609)
This change migrates `generate` make target from using the deprecated `cmd/mdatagen` in this repository to mdategen defined in core repository. To avoid breaking changes for the end users, we keep the scope names used in this repo as before. This required defining them explicitly in metadata.yaml files. We can update them after open-telemetry/opentelemetry-collector#9494 and open-telemetry#21469 are resolved. Taking the opportunity 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. This change unblocks open-telemetry#30495
1 parent e2d7946 commit bde317d

File tree

224 files changed

+310
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+310
-100
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ docker-telemetrygen:
257257

258258
.PHONY: generate
259259
generate: install-tools
260-
cd cmd/mdatagen && $(GOCMD) install .
260+
cd ./internal/tools && go install go.opentelemetry.io/collector/cmd/mdatagen
261261
$(MAKE) for-all CMD="$(GOCMD) generate ./..."
262262

263263
.PHONY: mdatagen-test

‎cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_status.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/mdatagen/validate_test.go

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
package main
55

66
import (
7-
"fmt"
8-
"io/fs"
9-
"path/filepath"
107
"testing"
118

12-
"github.com/stretchr/testify/assert"
139
"github.com/stretchr/testify/require"
1410
)
1511

@@ -105,49 +101,3 @@ func TestValidate(t *testing.T) {
105101
})
106102
}
107103
}
108-
109-
func TestValidateMetricDuplicates(t *testing.T) {
110-
allowedMetrics := map[string][]string{
111-
"container.cpu.utilization": {"docker_stats", "kubeletstats"},
112-
"container.memory.rss": {"docker_stats", "kubeletstats"},
113-
"container.uptime": {"docker_stats", "kubeletstats"},
114-
}
115-
allMetrics := map[string][]string{}
116-
err := filepath.Walk("../../receiver", func(path string, info fs.FileInfo, err error) error {
117-
if info.Name() == "metadata.yaml" {
118-
md, err := loadMetadata(path)
119-
require.NoError(t, err)
120-
if len(md.Metrics) > 0 {
121-
for metricName := range md.Metrics {
122-
allMetrics[md.Type] = append(allMetrics[md.Type], string(metricName))
123-
}
124-
}
125-
}
126-
return nil
127-
})
128-
require.NoError(t, err)
129-
130-
seen := make(map[string]string)
131-
for receiver, metrics := range allMetrics {
132-
for _, metricName := range metrics {
133-
if val, exists := seen[metricName]; exists {
134-
receivers, allowed := allowedMetrics[metricName]
135-
assert.True(
136-
t,
137-
allowed && contains(receiver, receivers) && contains(val, receivers),
138-
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),
139-
)
140-
}
141-
seen[metricName] = receiver
142-
}
143-
}
144-
}
145-
146-
func contains(r string, rs []string) bool {
147-
for _, s := range rs {
148-
if s == r {
149-
return true
150-
}
151-
}
152-
return false
153-
}

‎connector/countconnector/internal/metadata/generated_status.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/countconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: count
2+
scope_name: otelcol/countconnector
23

34
status:
45
class: connector

‎connector/datadogconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: datadog
2+
scope_name: otelcol/datadog
23

34
status:
45
class: connector

‎connector/exceptionsconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: exceptions
2+
scope_name: otelcol/exceptions
23

34
status:
45
class: connector

‎connector/failoverconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: failover
2+
scope_name: otelcol/failover
23

34
status:
45
class: connector

‎connector/routingconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: routing
2+
scope_name: otelcol/routing
23

34
status:
45
class: connector

‎connector/servicegraphconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: servicegraph
2+
scope_name: otelcol/servicegraph
23

34
status:
45
class: connector

‎connector/spanmetricsconnector/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: spanmetrics
2+
scope_name: otelcol/spanmetrics
23

34
status:
45
class: connector

‎exporter/alertmanagerexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: alertmanager
2+
scope_name: otelcol/alertmanager
23

34
status:
45
class: exporter

‎exporter/alibabacloudlogserviceexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: alibabacloud_logservice
2+
scope_name: otelcol/alibabacloudlogservice
23

34
status:
45
class: exporter

‎exporter/awscloudwatchlogsexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: awscloudwatchlogs
2+
scope_name: otelcol/awscloudwatchlogs
23

34
status:
45
class: exporter

‎exporter/awsemfexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: awsemf
2+
scope_name: otelcol/awsemf
23

34
status:
45
class: exporter

‎exporter/awskinesisexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: awskinesis
2+
scope_name: otelcol/awskinesis
23

34
status:
45
class: exporter

‎exporter/awss3exporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: awss3
2+
scope_name: otelcol/awss3
23

34
status:
45
class: exporter

‎exporter/awsxrayexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: awsxray
2+
scope_name: otelcol/awsxray
23

34
status:
45
class: exporter

‎exporter/azuredataexplorerexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: azuredataexplorer
2+
scope_name: otelcol/azuredataexplorer
23

34
status:
45
class: exporter

‎exporter/azuremonitorexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: azuremonitor
2+
scope_name: otelcol/azuremonitor
23

34
status:
45
class: exporter

‎exporter/carbonexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: carbon
2+
scope_name: otelcol/carbon
23

34
status:
45
class: exporter

‎exporter/cassandraexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: cassandra
2+
scope_name: otelcol/cassandra
23

34
status:
45
class: exporter

‎exporter/clickhouseexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: clickhouse
2+
scope_name: otelcol/clickhouse
23

34
status:
45
class: exporter

‎exporter/coralogixexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: coralogix
2+
scope_name: otelcol/coralogix
23

34
status:
45
class: exporter

‎exporter/datadogexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: datadog
2+
scope_name: otelcol/datadog
23

34
status:
45
class: exporter

‎exporter/datasetexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: dataset
2+
scope_name: otelcol/dataset
23

34
status:
45
class: exporter

‎exporter/dynatraceexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: dynatrace
2+
scope_name: otelcol/dynatrace
23

34
status:
45
class: exporter

‎exporter/elasticsearchexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: elasticsearch
2+
scope_name: otelcol/elasticsearch
23

34
status:
45
class: exporter

‎exporter/fileexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: file
2+
scope_name: otelcol/file
23

34
status:
45
class: exporter

‎exporter/googlecloudexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: googlecloud
2+
scope_name: otelcol/googlecloud
23

34
status:
45
class: exporter

‎exporter/googlecloudpubsubexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: googlecloudpubsub
2+
scope_name: otelcol/googlecloudpubsub
23

34
status:
45
class: exporter

‎exporter/googlemanagedprometheusexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: googlemanagedprometheus
2+
scope_name: otelcol/googlemanagedprometheus
23

34
status:
45
class: exporter

‎exporter/honeycombmarkerexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: honeycombmarker
2+
scope_name: otelcol/honeycombmarker
23

34
status:
45
class: exporter

‎exporter/influxdbexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: influxdb
2+
scope_name: otelcol/influxdb
23

34
status:
45
class: exporter

‎exporter/instanaexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: instana
2+
scope_name: otelcol/instana
23

34
status:
45
class: exporter

‎exporter/kafkaexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: kafka
2+
scope_name: otelcol/kafka
23

34
status:
45
class: exporter

‎exporter/kineticaexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: kinetica
2+
scope_name: otelcol/kinetica
23

34
status:
45
class: exporter

‎exporter/loadbalancingexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: loadbalancing
2+
scope_name: otelcol/loadbalancing
23

34
status:
45
class: exporter

‎exporter/logicmonitorexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: logicmonitor
2+
scope_name: otelcol/logicmonitor
23

34
status:
45
class: exporter

‎exporter/logzioexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: logzio
2+
scope_name: otelcol/logzio
23

34
status:
45
class: exporter

‎exporter/lokiexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: loki
2+
scope_name: otelcol/loki
23

34
status:
45
class: exporter

‎exporter/mezmoexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: mezmo
2+
scope_name: otelcol/mezmo
23

34
status:
45
class: exporter

‎exporter/opencensusexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: opencensus
2+
scope_name: otelcol/opencensus
23

34
status:
45
class: exporter

‎exporter/opensearchexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: opensearch
2+
scope_name: otelcol/opensearch
23

34
status:
45
class: exporter

‎exporter/otelarrowexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: otelarrow
2+
scope_name: otelcol/otelarrow
23

34
status:
45
class: exporter

‎exporter/prometheusexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: prometheus
2+
scope_name: otelcol/prometheus
23

34
status:
45
class: exporter

‎exporter/prometheusremotewriteexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: prometheusremotewrite
2+
scope_name: otelcol/prometheusremotewrite
23

34
status:
45
class: exporter

‎exporter/pulsarexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: pulsar
2+
scope_name: otelcol/pulsar
23

34
status:
45
class: exporter

‎exporter/sapmexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: sapm
2+
scope_name: otelcol/sapm
23

34
status:
45
class: exporter

‎exporter/sentryexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: sentry
2+
scope_name: otelcol/sentry
23

34
status:
45
class: exporter

‎exporter/signalfxexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: signalfx
2+
scope_name: otelcol/signalfx
23

34
status:
45
class: exporter

‎exporter/skywalkingexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: skywalking
2+
scope_name: otelcol/skywalking
23

34
status:
45
class: exporter

‎exporter/splunkhecexporter/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type: splunk_hec
2+
scope_name: otelcol/splunkhec
23

34
status:
45
class: exporter

0 commit comments

Comments
 (0)