From 40174201b9f814fe6ca682f2c6b8a8364d9aeb36 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez <mariorvinas@gmail.com>
Date: Wed, 3 Nov 2021 10:57:48 +0100
Subject: [PATCH] Validate logs config when using logs_instance

---
 CHANGELOG.md                                    | 2 ++
 pkg/traces/automaticloggingprocessor/factory.go | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03e1e3d00614..fb831d9ccc8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
 
diff --git a/pkg/traces/automaticloggingprocessor/factory.go b/pkg/traces/automaticloggingprocessor/factory.go
index 4dd1c2911fbd..723695b33833 100644
--- a/pkg/traces/automaticloggingprocessor/factory.go
+++ b/pkg/traces/automaticloggingprocessor/factory.go
@@ -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, ""