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.

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

fix(windows): Windows service not starting up #1512

Merged
merged 3 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .changelog/1512.fixed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
+ fix(windows): Fixed startup problem when running as a Windows service
31 changes: 20 additions & 11 deletions otelcolbuilder/cmd/collector_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,17 @@ func (s *windowsService) start(elog *eventlog.Log, colErrorChannel chan error) e
// Parse all the flags manually.
_ = elog.Info(6668, "parsing arguments")
if err := s.flags.Parse(os.Args[1:]); err != nil {
_ = elog.Info(6669, fmt.Sprintf("error parsing argumetn: %v", err))
_ = elog.Info(6669, fmt.Sprintf("error parsing argument: %v", err))
return err
}

_ = elog.Info(6670, "new collector with flags")
var err error
s.col, err = newCollectorWithFlags(s.settings, s.flags)
err = updateSettingsUsingFlags(&s.settings, s.flags)
if err != nil {
return err
}
s.col, err = otelcol.NewCollector(s.settings)
if err != nil {
return err
}
Expand Down Expand Up @@ -220,20 +224,25 @@ func withWindowsCore(elog *eventlog.Log) func(zapcore.Core) zapcore.Core {
}
}

func newCollectorWithFlags(set otelcol.CollectorSettings, flags *flag.FlagSet) (*otelcol.Collector, error) {
func updateSettingsUsingFlags(set *otelcol.CollectorSettings, flags *flag.FlagSet) error {
if set.ConfigProvider == nil {
resolverSet := &set.ConfigProviderSettings.ResolverSettings
configFlags := getConfigFlag(flags)
if len(configFlags) == 0 {
return nil, errors.New("at least one config flag must be provided")
}

var err error
set.ConfigProvider, err = otelcol.NewConfigProvider(newDefaultConfigProviderSettings(configFlags))
if err != nil {
return nil, err
if len(configFlags) > 0 {
resolverSet.URIs = configFlags
}
if len(resolverSet.URIs) == 0 {
return errors.New("at least one config flag must be provided")
}
sumo-drosiek marked this conversation as resolved.
Show resolved Hide resolved
// Provide a default set of providers and converters if none have been specified.
// TODO: Remove this after CollectorSettings.ConfigProvider is removed and instead
// do it in the builder.
if len(resolverSet.Providers) == 0 && len(resolverSet.Converters) == 0 {
set.ConfigProviderSettings = newDefaultConfigProviderSettings(resolverSet.URIs)
}
}
return otelcol.NewCollector(set)
return nil
}

func newDefaultConfigProviderSettings(uris []string) otelcol.ConfigProviderSettings {
Expand Down