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.

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

Jump to bottom

[chore] Improve startup error message #5978

Merged
merged 4 commits into from
Aug 26, 2022
Merged

[chore] Improve startup error message #5978

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd44c3c
Fix reading scope attributes for trace JSON, remove duplicate code
bogdandrutu Aug 17, 2022
4a71cc2
Added check for number of config flags
TylerHelmuth Aug 26, 2022
6647d57
Merge in upstream/main
TylerHelmuth Aug 26, 2022
51069ca
Update windows execute
TylerHelmuth Aug 26, 2022
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
Prev Previous commit
Update windows execute
  • Loading branch information
@TylerHelmuth
TylerHelmuth committed Aug 26, 2022
commit 51069ca18a9bd37616fdb65551b92f6a9ed73da1
9 changes: 8 additions & 1 deletion service/collector_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package service // import "go.opentelemetry.io/collector/service"

import (
"context"
"errors"
"flag"
"fmt"
"os"
Expand Down Expand Up @@ -143,7 +144,13 @@ func openEventLog(serviceName string) (*eventlog.Log, error) {
func newWithWindowsEventLogCore(set CollectorSettings, flags *flag.FlagSet, elog *eventlog.Log) (*Collector, error) {
if set.ConfigProvider == nil {
var err error
cfgSet := newDefaultConfigProviderSettings(getConfigFlag(flags))

configFlags := getConfigFlag(flags)
if len(configFlags) == 0 {
return nil, errors.New("at least one config flag must be provided")
}

cfgSet := newDefaultConfigProviderSettings(configFlags)
// Append the "overwrite properties converter" as the first converter.
cfgSet.ResolverSettings.Converters = append(
[]confmap.Converter{overwritepropertiesconverter.New(getSetFlag(flags))},
Expand Down