Skip to content

Commit

Permalink
[mdatagen] only generate telemetry as needed (#10129)
Browse files Browse the repository at this point in the history 
This prevent unnecessary files from being generated if metadata.yaml
doesn't include any internal telemetry for a component.

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
@codeboten
codeboten committed May 9, 2024
1 parent aea26e1 commit c555005
Show file tree
Hide file tree
Showing 37 changed files with 35 additions and 1,003 deletions.
20 changes: 12 additions & 8 deletions cmd/mdatagen/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,7 @@ func run(ymlPath string) error {
return err
}
}
if err = generateFile(filepath.Join(tmplDir, "telemetry.go.tmpl"),
filepath.Join(codeDir, "generated_telemetry.go"), md, "metadata"); err != nil {
return err
}
if err = generateFile(filepath.Join(tmplDir, "telemetry_test.go.tmpl"),
filepath.Join(codeDir, "generated_telemetry_test.go"), md, "metadata"); err != nil {
return err
}

if err = generateFile(filepath.Join(tmplDir, "package_test.go.tmpl"),
filepath.Join(ymlDir, "generated_package_test.go"), md, packageName); err != nil {
return err
Expand All @@ -92,6 +85,17 @@ func run(ymlPath string) error {
}
}

if len(md.Telemetry.Metrics) != 0 {
if err = generateFile(filepath.Join(tmplDir, "telemetry.go.tmpl"),
filepath.Join(codeDir, "generated_telemetry.go"), md, "metadata"); err != nil {
return err
}
if err = generateFile(filepath.Join(tmplDir, "telemetry_test.go.tmpl"),
filepath.Join(codeDir, "generated_telemetry_test.go"), md, "metadata"); err != nil {
return err
}
}

if len(md.Metrics) == 0 && len(md.ResourceAttributes) == 0 {
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions connector/forwardconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ require (
go.opentelemetry.io/collector/connector v0.100.0
go.opentelemetry.io/collector/consumer v0.100.0
go.opentelemetry.io/collector/pdata v1.7.0
go.opentelemetry.io/otel/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/goleak v1.3.0
)

Expand Down Expand Up @@ -40,8 +38,10 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.24.0 // indirect
Expand Down
18 changes: 0 additions & 18 deletions connector/forwardconnector/internal/metadata/generated_telemetry.go
View file

This file was deleted.

63 changes: 0 additions & 63 deletions connector/forwardconnector/internal/metadata/generated_telemetry_test.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions exporter/debugexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ require (
go.opentelemetry.io/collector/consumer v0.100.0
go.opentelemetry.io/collector/exporter v0.100.0
go.opentelemetry.io/collector/pdata v1.7.0
go.opentelemetry.io/otel/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
Expand Down Expand Up @@ -45,8 +43,10 @@ require (
go.opentelemetry.io/collector/receiver v0.100.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.20.0 // indirect
Expand Down
18 changes: 0 additions & 18 deletions exporter/debugexporter/internal/metadata/generated_telemetry.go
View file

This file was deleted.

63 changes: 0 additions & 63 deletions exporter/debugexporter/internal/metadata/generated_telemetry_test.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions exporter/loggingexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ require (
go.opentelemetry.io/collector/confmap v0.100.0
go.opentelemetry.io/collector/exporter v0.100.0
go.opentelemetry.io/collector/pdata v1.7.0
go.opentelemetry.io/otel/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
)
Expand Down Expand Up @@ -46,8 +44,10 @@ require (
go.opentelemetry.io/collector/receiver v0.100.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.20.0 // indirect
Expand Down
18 changes: 0 additions & 18 deletions exporter/loggingexporter/internal/metadata/generated_telemetry.go
View file

This file was deleted.

63 changes: 0 additions & 63 deletions exporter/loggingexporter/internal/metadata/generated_telemetry_test.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions exporter/nopexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ require (
go.opentelemetry.io/collector/consumer v0.100.0
go.opentelemetry.io/collector/exporter v0.100.0
go.opentelemetry.io/collector/pdata v1.7.0
go.opentelemetry.io/otel/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/goleak v1.3.0
)

Expand Down Expand Up @@ -42,8 +40,10 @@ require (
go.opentelemetry.io/collector/receiver v0.100.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.24.0 // indirect
Expand Down
18 changes: 0 additions & 18 deletions exporter/nopexporter/internal/metadata/generated_telemetry.go
View file

This file was deleted.

0 comments on commit c555005

Please sign in to comment.