Skip to content

builder: avoid duplicate CLI error logging in generated main #14317

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

Merged
bogdandrutu merged 7 commits into from
Jan 8, 2026
+35 −6
Merged

builder: avoid duplicate CLI error logging in generated main #14317

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bff5b85
builder: avoid duplicate CLI error logging in generated main
Syedowais312 Dec 21, 2025
eeb43e7
Merge branch 'main' into fix/ocb-duplicate-cli-error-log
Syedowais312 Jan 5, 2026
70644ec
cmd/builder: clarify CLI error handling and update changelog
Syedowais312 Jan 5, 2026
ff649d5
Merge branch 'main' into fix/ocb-duplicate-cli-error-log
Syedowais312 Jan 6, 2026
75db0fb
cmd/otelcorecol: regenerate generated code
Syedowais312 Jan 7, 2026
4f49aea
Merge branch 'main' into fix/ocb-duplicate-cli-error-log
Syedowais312 Jan 7, 2026
bd3991a
Merge branch 'main' into fix/ocb-duplicate-cli-error-log
Syedowais312 Jan 7, 2026
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
6 changes: 3 additions & 3 deletions cmd/builder/internal/builder/templates/main.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package main

import (
"log"
"os"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"
Expand Down Expand Up @@ -59,14 +59,14 @@ func main() {
}

if err := run(set); err != nil {
log.Fatal(err)
os.Exit(1)
}
}

func runInteractive(params otelcol.CollectorSettings) error {
cmd := otelcol.NewCommand(params)
if err := cmd.Execute(); err != nil {
log.Fatalf("collector server run finished with error: %v", err)
return err
}

return nil
Expand Down