From eb92ea8715b44eef820b165808a52b8c57dbb776 Mon Sep 17 00:00:00 2001
From: Genseric Ghiro <gghiro@confluent.io>
Date: Fri, 31 Oct 2025 14:25:20 -0400
Subject: [PATCH 1/5] Follow up to 20766: updating the docs

---
 docs/ops.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ops.html b/docs/ops.html
index fcef480f2c91a..0f498ebdf3c49 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -3000,7 +3000,7 @@ <h5 class="anchor-heading"><a id="kafka_streams_client_monitoring" class="anchor
   <tr>
     <td>client-state</td>
     <td>The state of the Kafka Streams client as a number (<code>ordinal()</code> of the corresponding enum).</td>
-    <td>kafka.streams:type=stream-metrics,client-id=([-.\w]+),process-id=([-.\w]+)</td>
+    <td>kafka.streams:type=stream-metrics,client-id=([-.\w]+),process-id=([-.\w]+,application-id=[-.\w]+)</td>
   </tr>
   <tr>
     <td>alive-stream-threads</td>
@@ -3037,7 +3037,7 @@ <h5 class="anchor-heading"><a id="kafka_streams_thread_monitoring" class="anchor
       <tr>
         <td>thread-state</td>
         <td>The state of the thread as a number (<code>ordinal()</code> of the corresponding enum).</td>
-        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+)</td>
+        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+,application-id=[-.\w]+)</td>
       </tr>
       <tr>
         <td>commit-latency-avg</td>

From fd432e631d0d95dfece83afb629b0bc1184f393a Mon Sep 17 00:00:00 2001
From: Genseric Ghiro <gghiro@confluent.io>
Date: Fri, 31 Oct 2025 14:28:50 -0400
Subject: [PATCH 2/5] Typo

---
 docs/ops.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ops.html b/docs/ops.html
index 0f498ebdf3c49..82b97be21ff3a 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -3000,7 +3000,7 @@ <h5 class="anchor-heading"><a id="kafka_streams_client_monitoring" class="anchor
   <tr>
     <td>client-state</td>
     <td>The state of the Kafka Streams client as a number (<code>ordinal()</code> of the corresponding enum).</td>
-    <td>kafka.streams:type=stream-metrics,client-id=([-.\w]+),process-id=([-.\w]+,application-id=[-.\w]+)</td>
+    <td>kafka.streams:type=stream-metrics,client-id=([-.\w]+),process-id=([-.\w]+),application-id=([-.\w]+)</td>
   </tr>
   <tr>
     <td>alive-stream-threads</td>
@@ -3037,7 +3037,7 @@ <h5 class="anchor-heading"><a id="kafka_streams_thread_monitoring" class="anchor
       <tr>
         <td>thread-state</td>
         <td>The state of the thread as a number (<code>ordinal()</code> of the corresponding enum).</td>
-        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+,application-id=[-.\w]+)</td>
+        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+),application-id=([-.\w]+)</td>
       </tr>
       <tr>
         <td>commit-latency-avg</td>

From b1fdd3455e5b1d397fbb1cf11bb2028f6e540003 Mon Sep 17 00:00:00 2001
From: Genseric Ghiro <gghiro@confluent.io>
Date: Tue, 4 Nov 2025 17:14:21 -0500
Subject: [PATCH 3/5] Removing application id tag from thread state metric's
 documentation

---
 docs/ops.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ops.html b/docs/ops.html
index 82b97be21ff3a..fee3a9b44cd68 100644
--- a/docs/ops.html
+++ b/docs/ops.html
@@ -3037,7 +3037,7 @@ <h5 class="anchor-heading"><a id="kafka_streams_thread_monitoring" class="anchor
       <tr>
         <td>thread-state</td>
         <td>The state of the thread as a number (<code>ordinal()</code> of the corresponding enum).</td>
-        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+),application-id=([-.\w]+)</td>
+        <td>kafka.streams:type=stream-thread-metrics,thread-id=([-.\w]+),process-id=([-.\w]+)</td>
       </tr>
       <tr>
         <td>commit-latency-avg</td>

From eca315b9ee922fbbdfe82a150d96d087e1d981cc Mon Sep 17 00:00:00 2001
From: Genseric Ghiro <gghiro@confluent.io>
Date: Thu, 20 Nov 2025 12:57:06 -0500
Subject: [PATCH 4/5] Adding upgrade note

---
 docs/streams/upgrade-guide.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/streams/upgrade-guide.html b/docs/streams/upgrade-guide.html
index 3b12fde2e05e4..796ba3728fc81 100644
--- a/docs/streams/upgrade-guide.html
+++ b/docs/streams/upgrade-guide.html
@@ -146,6 +146,13 @@ <h3><a id="streams_api_changes_420" href="#streams_api_changes_420">Streams API
         More details can be found in <a href="https://cwiki.apache.org/confluence/x/ywnxFg">KIP-1216</a>.
     </p>
 
+    <p>
+        The <code>application-id</code> tag is now available for the Kafka Streams client state metric (<code>client-state</code>).
+        Additionally, the <code>process-id</code> tag is no longer a default client-level tag. It is now only available
+        for the following three metrics: <code>client-state</code>, <code>recording-level</code>, and <code>thread-state</code>.
+        More details can be found in <a href="https://cwiki.apache.org/confluence/x/jQobFw">KIP-1221</a>
+    </p>
+
     <h3><a id="streams_api_changes_410" href="#streams_api_changes_410">Streams API changes in 4.1.0</a></h3>
 
     <p><b>Note:</b> Kafka Streams 4.1.0 contains a critical memory leak bug (<a href="https://issues.apache.org/jira/browse/KAFKA-19748">KAFKA-19748</a>) that affects users of range scans and certain DSL operators (session windows, sliding windows, stream-stream joins, foreign-key joins). Users running Kafka Streams should consider upgrading directly to 4.1.1, which includes the fix for it.</p>

From 1d49eecb170ec914734c83c8d5e63f440ec024fa Mon Sep 17 00:00:00 2001
From: Genseric Ghiro <gghiro@confluent.io>
Date: Thu, 20 Nov 2025 16:01:57 -0500
Subject: [PATCH 5/5] Addressing comments

---
 docs/streams/upgrade-guide.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/streams/upgrade-guide.html b/docs/streams/upgrade-guide.html
index 796ba3728fc81..5037410f3d61e 100644
--- a/docs/streams/upgrade-guide.html
+++ b/docs/streams/upgrade-guide.html
@@ -148,9 +148,7 @@ <h3><a id="streams_api_changes_420" href="#streams_api_changes_420">Streams API
 
     <p>
         The <code>application-id</code> tag is now available for the Kafka Streams client state metric (<code>client-state</code>).
-        Additionally, the <code>process-id</code> tag is no longer a default client-level tag. It is now only available
-        for the following three metrics: <code>client-state</code>, <code>recording-level</code>, and <code>thread-state</code>.
-        More details can be found in <a href="https://cwiki.apache.org/confluence/x/jQobFw">KIP-1221</a>
+        More details can be found in <a href="https://cwiki.apache.org/confluence/x/jQobFw">KIP-1221</a>.
     </p>
 
     <h3><a id="streams_api_changes_410" href="#streams_api_changes_410">Streams API changes in 4.1.0</a></h3>