Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

Validate logs config when using logs_instance #1058

Merged
mapno merged 1 commit into from
Nov 3, 2021
Merged

Validate logs config when using logs_instance #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

- [BUGFIX] Packaging: Use correct user/group env variables in RPM %post script (@simonc6372)

- [BUGFIX] Validate logs config when using logs_instance with automatic logging processor (@mapno)


# v0.20.0 (2021-10-28)

Expand Down
4 changes: 4 additions & 0 deletions pkg/traces/automaticloggingprocessor/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ func (c *AutomaticLoggingConfig) Validate(logsConfig *logs.Config) error {
return fmt.Errorf("must configure at most one of logs_instance_name and loki_name. loki_name is deprecated in favor of logs_instance_name")
}

if c.LogsName != "" && logsConfig == nil {
return fmt.Errorf("logs instance %s is set but no logs config is provided", c.LogsName)
}

// Migrate deprecated config to new one
if c.LogsName == "" && c.LokiName != "" {
c.LogsName, c.LokiName = c.LokiName, ""
Expand Down