From ab239b685373e66f066b785425f4effba4fad1e0 Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 10 Apr 2026 12:01:57 +0300
Subject: [PATCH 1/3] fix: reset client report counters during initialization

---
 src/sentry_client_report.c | 10 ++++++++++
 src/sentry_client_report.h |  7 +++++++
 src/sentry_core.c          |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/src/sentry_client_report.c b/src/sentry_client_report.c
index f69bf7f90..2c553b9d8 100644
--- a/src/sentry_client_report.c
+++ b/src/sentry_client_report.c
@@ -64,3 +64,13 @@ sentry__client_report_restore(sentry_client_report_t *report)
     }
     memset(report, 0, sizeof(*report));
 }
+
+void
+sentry__client_report_reset(void)
+{
+    for (int r = 0; r < SENTRY_DISCARD_REASON_MAX; r++) {
+        for (int c = 0; c < SENTRY_DATA_CATEGORY_MAX; c++) {
+            sentry__atomic_store((long *)&g_discard_counts[r][c], 0);
+        }
+    }
+}
diff --git a/src/sentry_client_report.h b/src/sentry_client_report.h
index 4f5e5b7de..d1e6372b5 100644
--- a/src/sentry_client_report.h
+++ b/src/sentry_client_report.h
@@ -63,4 +63,11 @@ bool sentry__client_report_save(sentry_client_report_t *report);
  */
 void sentry__client_report_restore(sentry_client_report_t *report);
 
+/**
+ * Reset all pending discard counters to zero.
+ * Called during sentry_init() so that stale counts from a previous session
+ * do not leak into the new one.
+ */
+void sentry__client_report_reset(void);
+
 #endif
diff --git a/src/sentry_core.c b/src/sentry_core.c
index b3c214868..6ab61a810 100644
--- a/src/sentry_core.c
+++ b/src/sentry_core.c
@@ -172,6 +172,8 @@ sentry_init(sentry_options_t *options)
 
     sentry_close();
 
+    sentry__client_report_reset();
+
     sentry_logger_t logger = { NULL, NULL, SENTRY_LEVEL_DEBUG };
 
     if (options->debug) {

From ed32597bf68d50cf2f03e5c8ed0fd9dbfd7faa9e Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 10 Apr 2026 12:30:43 +0300
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfc6d52ba..f3b4825d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+**Fixes**:
+
+- Reset client report counters during initialization ([#1632](https://github.com/getsentry/sentry-native/pull/1632))
+
 ## 0.13.6
 
 **Features**:

From 023ec89d9832ef79a1a8661324a3cb43cbd8a6c5 Mon Sep 17 00:00:00 2001
From: Ivan Tustanivskyi <tustanivsky@gmail.com>
Date: Fri, 10 Apr 2026 16:53:54 +0300
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02bf6dbf4..401e8d569 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,8 @@
 
 **Fixes**:
 
-<<<<<<< fix/discard-count-reset
 - Reset client report counters during initialization ([#1632](https://github.com/getsentry/sentry-native/pull/1632))
-=======
 - macOS: cache VM regions for FP validation in the new unwinder. ([#1634](https://github.com/getsentry/sentry-native/pull/1634))
->>>>>>> master
 
 ## 0.13.6