From c7b5b63714bc246bd5979aefea6a07a8cb6d474e Mon Sep 17 00:00:00 2001
From: Carson Ip <carson.ip@elastic.co>
Date: Wed, 21 Feb 2024 11:04:04 +0000
Subject: [PATCH 1/3] telemetrygen: Fix incorrect error in log line

---
 cmd/telemetrygen/internal/traces/traces.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/telemetrygen/internal/traces/traces.go b/cmd/telemetrygen/internal/traces/traces.go
index 5f3529253cf1..02817577b915 100644
--- a/cmd/telemetrygen/internal/traces/traces.go
+++ b/cmd/telemetrygen/internal/traces/traces.go
@@ -73,7 +73,7 @@ func Start(cfg *Config) error {
 		defer func() {
 			logger.Info("stop the batch span processor")
 			if tempError := ssp.Shutdown(context.Background()); tempError != nil {
-				logger.Error("failed to stop the batch span processor", zap.Error(err))
+				logger.Error("failed to stop the batch span processor", zap.Error(tempError))
 			}
 		}()
 	}

From c529a25a8b9629083389037f0597aa2305f7e9a8 Mon Sep 17 00:00:00 2001
From: Carson Ip <carson.ip@elastic.co>
Date: Thu, 22 Feb 2024 17:17:50 +0000
Subject: [PATCH 2/3] Add changelog

---
 .../telemetrygen-fix-log-incorrect-error.yaml | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .chloggen/telemetrygen-fix-log-incorrect-error.yaml

diff --git a/.chloggen/telemetrygen-fix-log-incorrect-error.yaml b/.chloggen/telemetrygen-fix-log-incorrect-error.yaml
new file mode 100644
index 000000000000..eb68b234c2d3
--- /dev/null
+++ b/.chloggen/telemetrygen-fix-log-incorrect-error.yaml
@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: cmd/telemetrygen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix incorrect error logged in traces batch span processor shutdown
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: []
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

From 140e07a494ec27b1a7e1faa364a9ccf923f93077 Mon Sep 17 00:00:00 2001
From: Carson Ip <carson.ip@elastic.co>
Date: Fri, 23 Feb 2024 11:19:55 +0000
Subject: [PATCH 3/3] Add issues in changelog

---
 .chloggen/telemetrygen-fix-log-incorrect-error.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.chloggen/telemetrygen-fix-log-incorrect-error.yaml b/.chloggen/telemetrygen-fix-log-incorrect-error.yaml
index eb68b234c2d3..bddd0037fe0f 100644
--- a/.chloggen/telemetrygen-fix-log-incorrect-error.yaml
+++ b/.chloggen/telemetrygen-fix-log-incorrect-error.yaml
@@ -10,7 +10,7 @@ component: cmd/telemetrygen
 note: Fix incorrect error logged in traces batch span processor shutdown
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
-issues: []
+issues: [31362]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.