If mdatagen is causing file renames, e.g. migration to the new metric…

…s builder, running `go generate ./...` ends up with a failure `no such file or directory` even if the `mdatagen` command successfully completed. The root cause of that is in how go generate works. This change adds a workaround for the issue using go build tags.
open-telemetry · Jun 9, 2022 · f80c75e · f80c75e
1 parent e78c75c
commit f80c75e
Show file tree

Hide file tree

Showing 37 changed files with 231 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -256,7 +256,7 @@ docker-otelcontribcol:
 .PHONY: generate
 generate:
 	cd cmd/mdatagen && $(GOCMD) install .
-	$(MAKE) for-all CMD="$(GOCMD) generate ./..."
+	$(MAKE) for-all CMD="$(GOCMD) generate -tags generate ./..."
 
 # Build the Collector executable.
 .PHONY: otelcontribcol

diff --git a/cmd/mdatagen/metrics.tmpl b/cmd/mdatagen/metrics.tmpl
@@ -1,5 +1,8 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+//go:build !generate
+// +build !generate
+
 package {{ .Package }}
 
 import (

diff --git a/cmd/mdatagen/metrics_v2.tmpl b/cmd/mdatagen/metrics_v2.tmpl
@@ -1,5 +1,8 @@
 // Code generated by mdatagen. DO NOT EDIT.
 
+//go:build !generate
+// +build !generate
+
 package {{ .Package }}
 
 import (

diff --git a/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_v2.go b/receiver/activedirectorydsreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/apachereceiver/internal/metadata/generated_metrics_v2.go b/receiver/apachereceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/bigipreceiver/internal/metadata/generated_metrics_v2.go b/receiver/bigipreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/couchbasereceiver/internal/metadata/generated_metrics_v2.go b/receiver/couchbasereceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/couchdbreceiver/internal/metadata/generated_metrics_v2.go b/receiver/couchdbreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_v2.go b/receiver/elasticsearchreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/expvarreceiver/internal/metadata/generated_metrics_v2.go b/receiver/expvarreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_v2.go b/receiver/flinkmetricsreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/...hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_v2.go b/...hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...ostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_v2.go b/...ostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...ricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_v2.go b/...ricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...ostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_v2.go b/...ostmetricsreceiver/internal/scraper/loadscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...tmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_v2.go b/...tmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...metricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_v2.go b/...metricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...tmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_v2.go b/...tmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...tricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_v2.go b/...tricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics_v2.go
diff --git a/...metricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_v2.go b/...metricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/iisreceiver/internal/metadata/generated_metrics_v2.go b/receiver/iisreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go b/receiver/kafkametricsreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_v2.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/memcachedreceiver/internal/metadata/generated_metrics_v2.go b/receiver/memcachedreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_v2.go b/receiver/mongodbatlasreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/mongodbreceiver/internal/metadata/generated_metrics_v2.go b/receiver/mongodbreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/mysqlreceiver/internal/metadata/generated_metrics_v2.go b/receiver/mysqlreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics_v2.go b/receiver/nginxreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/nsxtreceiver/internal/metadata/generated_metrics_v2.go b/receiver/nsxtreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics_v2.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics_v2.go
diff --git a/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_v2.go b/receiver/rabbitmqreceiver/internal/metadata/generated_metrics_v2.go