Skip to content

Commit a4bf57e

Browse files
committed
Fix the failing GA by committing the output of the generate command
1 parent 9a5ecf3 commit a4bf57e

File tree

5 files changed

+38
-37
lines changed

5 files changed

+38
-37
lines changed

collector/components.go

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

collector/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module github.com/grafana/alloy/otel_engine
55
go 1.25.5
66

77
require (
8+
github.com/grafana/alloy v0.0.0-00010101000000-000000000000
89
github.com/grafana/alloy/extension/alloyengine v0.1.0
910
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.139.0
1011
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.139.0
@@ -18,6 +19,7 @@ require (
1819
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.139.0
1920
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.139.0
2021
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.139.0
22+
github.com/spf13/cobra v1.10.1
2123
go.opentelemetry.io/collector/component v1.45.0
2224
go.opentelemetry.io/collector/confmap v1.49.0
2325
go.opentelemetry.io/collector/confmap/provider/envprovider v1.45.0
@@ -420,7 +422,6 @@ require (
420422
github.com/gorilla/mux v1.8.1 // indirect
421423
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
422424
github.com/gosnmp/gosnmp v1.41.0 // indirect
423-
github.com/grafana/alloy v0.0.0-00010101000000-000000000000 // indirect
424425
github.com/grafana/alloy-remote-config v0.0.12 // indirect
425426
github.com/grafana/alloy/syntax v0.1.0 // indirect
426427
github.com/grafana/beyla/v2 v2.7.10 // indirect
@@ -782,7 +783,6 @@ require (
782783
github.com/sony/gobreaker/v2 v2.3.0 // indirect
783784
github.com/spaolacci/murmur3 v1.1.0 // indirect
784785
github.com/spf13/cast v1.10.0 // indirect
785-
github.com/spf13/cobra v1.10.1 // indirect
786786
github.com/spf13/jwalterweatherman v1.1.0 // indirect
787787
github.com/spf13/pflag v1.0.10 // indirect
788788
github.com/stackitcloud/stackit-sdk-go/core v0.17.3 // indirect

collector/main.go

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

collector/main_alloy.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import (
88
)
99

1010
func newAlloyCommand(params otelcol.CollectorSettings) *cobra.Command {
11-
otelCmd := otelcol.NewCommand(params)
11+
otelCmd := otelcol.NewCommand(params)
1212

13-
otelCmd.Use = "otel"
14-
otelCmd.Short = "Use Alloy with OTel Engine"
15-
otelCmd.Long = "[EXPERIMENTAL] Use Alloy with OpenTelemetry Collector Engine"
13+
otelCmd.Use = "otel"
14+
otelCmd.Short = "Use Alloy with OTel Engine"
15+
otelCmd.Long = "[EXPERIMENTAL] Use Alloy with OpenTelemetry Collector Engine"
1616

17-
flowCmd := flowcmd.RootCommand()
18-
flowCmd.AddCommand(otelCmd)
17+
flowCmd := flowcmd.RootCommand()
18+
flowCmd.AddCommand(otelCmd)
1919

20-
// TODO: Officially add this command to expose in a follow up PR
21-
otelCmd.Hidden = true
22-
return flowCmd
23-
}
20+
// TODO: Officially add this command to expose in a follow up PR
21+
otelCmd.Hidden = true
22+
return flowCmd
23+
}

collector/main_windows.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.

0 commit comments

Comments
 (0)