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

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

Merged
merged 1 commit into from
Mar 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_status.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 0 additions & 50 deletions cmd/mdatagen/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
package main

import (
"fmt"
"io/fs"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions connector/countconnector/internal/metadata/generated_status.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions connector/countconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: count
scope_name: otelcol/countconnector

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/datadogconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: datadog
scope_name: otelcol/datadog

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/exceptionsconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: exceptions
scope_name: otelcol/exceptions

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/failoverconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: failover
scope_name: otelcol/failover

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/routingconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: routing
scope_name: otelcol/routing

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/servicegraphconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: servicegraph
scope_name: otelcol/servicegraph

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions connector/spanmetricsconnector/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: spanmetrics
scope_name: otelcol/spanmetrics

status:
class: connector
Expand Down
1 change: 1 addition & 0 deletions exporter/alertmanagerexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: alertmanager
scope_name: otelcol/alertmanager

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/alibabacloudlogserviceexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: alibabacloud_logservice
scope_name: otelcol/alibabacloudlogservice

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/awscloudwatchlogsexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: awscloudwatchlogs
scope_name: otelcol/awscloudwatchlogs

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/awsemfexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: awsemf
scope_name: otelcol/awsemf

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/awskinesisexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: awskinesis
scope_name: otelcol/awskinesis

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/awss3exporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: awss3
scope_name: otelcol/awss3

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/awsxrayexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: awsxray
scope_name: otelcol/awsxray

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/azuredataexplorerexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: azuredataexplorer
scope_name: otelcol/azuredataexplorer

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/azuremonitorexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: azuremonitor
scope_name: otelcol/azuremonitor

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/carbonexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: carbon
scope_name: otelcol/carbon

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/cassandraexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: cassandra
scope_name: otelcol/cassandra

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/clickhouseexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: clickhouse
scope_name: otelcol/clickhouse

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/coralogixexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: coralogix
scope_name: otelcol/coralogix

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/datadogexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: datadog
scope_name: otelcol/datadog

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/datasetexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: dataset
scope_name: otelcol/dataset

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/dynatraceexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: dynatrace
scope_name: otelcol/dynatrace

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/elasticsearchexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: elasticsearch
scope_name: otelcol/elasticsearch

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/fileexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: file
scope_name: otelcol/file

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/googlecloudexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: googlecloud
scope_name: otelcol/googlecloud

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/googlecloudpubsubexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: googlecloudpubsub
scope_name: otelcol/googlecloudpubsub

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/googlemanagedprometheusexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: googlemanagedprometheus
scope_name: otelcol/googlemanagedprometheus

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/honeycombmarkerexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: honeycombmarker
scope_name: otelcol/honeycombmarker

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/influxdbexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: influxdb
scope_name: otelcol/influxdb

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/instanaexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: instana
scope_name: otelcol/instana

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/kafkaexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: kafka
scope_name: otelcol/kafka

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/kineticaexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: kinetica
scope_name: otelcol/kinetica

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/loadbalancingexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: loadbalancing
scope_name: otelcol/loadbalancing

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/logicmonitorexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: logicmonitor
scope_name: otelcol/logicmonitor

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/logzioexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: logzio
scope_name: otelcol/logzio

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/lokiexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: loki
scope_name: otelcol/loki

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/mezmoexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: mezmo
scope_name: otelcol/mezmo

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/opencensusexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: opencensus
scope_name: otelcol/opencensus

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/opensearchexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: opensearch
scope_name: otelcol/opensearch

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/otelarrowexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: otelarrow
scope_name: otelcol/otelarrow

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/prometheusexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: prometheus
scope_name: otelcol/prometheus

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/prometheusremotewriteexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: prometheusremotewrite
scope_name: otelcol/prometheusremotewrite

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/pulsarexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: pulsar
scope_name: otelcol/pulsar

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/sapmexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: sapm
scope_name: otelcol/sapm

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/sentryexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: sentry
scope_name: otelcol/sentry

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/signalfxexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: signalfx
scope_name: otelcol/signalfx

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/skywalkingexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: skywalking
scope_name: otelcol/skywalking

status:
class: exporter
Expand Down
1 change: 1 addition & 0 deletions exporter/splunkhecexporter/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
type: splunk_hec
scope_name: otelcol/splunkhec

status:
class: exporter
Expand Down
Loading
Loading