Improve exception hashing

FrayxRulez · FrayxRulez · commit 317a58d79c7f · 2025-11-06T17:29:09.000+04:00
diff --git a/Telegram/Common/ExceptionSerializer.cs b/Telegram/Common/ExceptionSerializer.cs
@@ -28,31 +28,22 @@ public static class ExceptionSerializer
 
         public static string Serialize(System.Exception exception, string id, string userId, string logs)
         {
-            var error = CreateModelExceptionAndBinaries(exception);
-            var report = new ErrorReport
-            {
-                Id = id,
-                UserId = userId,
-                ApplicationVersion = _service.ApplicationVersion2,
-                ApplicationArchitecture = Package.Current.Id.Architecture.ToString(),
-                SystemVersion = _service.SystemVersion2,
-                DeviceModel = _service.DeviceModel,
-                Type = error.Exception.Type,
-                Message = error.Exception.Message,
-                ExitPoint = error.Exception.StackTrace,
-                StackTrace = error,
-                LogTail = logs,
-                GroupHash = error.Hash,
-                Time = MonotonicUnixTime.Now,
-                LaunchTime = WatchDog.LaunchTime
-            };
+            var hashBuilder = new StringBuilder();
+            var error = CreateModelExceptionAndBinaries(exception, hashBuilder);
 
-            return JsonSerializer.Serialize(report, ErrorJsonContext.Default.ErrorReport);
+            return Serialize(error, id, userId, logs, hashBuilder);
         }
 
         public static string Serialize(FatalError exception, string id, string userId, string logs)
         {
-            var error = CreateModelExceptionAndBinaries(exception);
+            var hashBuilder = new StringBuilder();
+            var error = CreateModelExceptionAndBinaries(exception, hashBuilder);
+
+            return Serialize(error, id, userId, logs, hashBuilder);
+        }
+
+        private static string Serialize(ErrorExceptionAndBinaries error, string id, string userId, string logs, StringBuilder hashBuilder)
+        {
             var report = new ErrorReport
             {
                 Id = id,
@@ -66,39 +57,37 @@ public static string Serialize(FatalError exception, string id, string userId, s
                 ExitPoint = error.Exception.StackTrace,
                 StackTrace = error,
                 LogTail = logs,
-                GroupHash = error.Hash,
                 Time = MonotonicUnixTime.Now,
                 LaunchTime = WatchDog.LaunchTime
             };
 
+            hashBuilder.Append(report.ApplicationVersion);
+            report.GroupHash = ComputeHash(hashBuilder.ToString());
+
             return JsonSerializer.Serialize(report, ErrorJsonContext.Default.ErrorReport);
         }
 
-        public static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(System.Exception exception)
+        private static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(System.Exception exception, StringBuilder hashBuilder)
         {
             var binaries = new Dictionary<long, ExceptionBinary>();
-            var hashBuilder = new StringBuilder();
             var modelException = ProcessException(exception, null, binaries, hashBuilder);
 
             return new ErrorExceptionAndBinaries
             {
                 Binaries = binaries.Count > 0 ? binaries.Values.ToList() : null,
-                Exception = modelException,
-                Hash = ComputeHash(hashBuilder.ToString())
+                Exception = modelException
             };
         }
 
-        public static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(FatalError exception)
+        private static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(FatalError exception, StringBuilder hashBuilder)
         {
             var binaries = new Dictionary<long, ExceptionBinary>();
-            var hashBuilder = new StringBuilder();
             var modelException = ProcessException(exception, binaries, hashBuilder);
 
             return new ErrorExceptionAndBinaries
             {
                 Binaries = binaries.Count > 0 ? binaries.Values.ToList() : null,
-                Exception = modelException,
-                Hash = ComputeHash(hashBuilder.ToString())
+                Exception = modelException
             };
         }
 
@@ -179,7 +168,7 @@ void AppendHash(ExceptionBinary binary)
                         }
                         else
                         {
-                            hashBuilder.Append(binary.StartAddress);
+                            hashBuilder.Append(binary.Name);
                         }
                     }
 
@@ -245,7 +234,7 @@ void AppendHash(ExceptionBinary binary)
                     }
                     else
                     {
-                        hashBuilder.Append(binary.StartAddress);
+                        hashBuilder.Append(binary.Name);
                     }
                 }
 
@@ -657,9 +646,6 @@ public partial class ErrorExceptionAndBinaries
 
         [JsonPropertyName("exception")]
         public ExceptionModel Exception { get; set; }
-
-        [JsonIgnore]
-        public string Hash { get; set; }
     }
 
     public partial class ExceptionModel

Original file line number	Diff line number	Diff line change
`@@ -28,31 +28,22 @@ public static class ExceptionSerializer`
`28`	`28`
`29`	`29`	`public static string Serialize(System.Exception exception, string id, string userId, string logs)`
`30`	`30`	`{`
`31`		`- var error = CreateModelExceptionAndBinaries(exception);`
`32`		`- var report = new ErrorReport`
`33`		`- {`
`34`		`- Id = id,`
`35`		`- UserId = userId,`
`36`		`- ApplicationVersion = _service.ApplicationVersion2,`
`37`		`- ApplicationArchitecture = Package.Current.Id.Architecture.ToString(),`
`38`		`- SystemVersion = _service.SystemVersion2,`
`39`		`- DeviceModel = _service.DeviceModel,`
`40`		`- Type = error.Exception.Type,`
`41`		`- Message = error.Exception.Message,`
`42`		`- ExitPoint = error.Exception.StackTrace,`
`43`		`- StackTrace = error,`
`44`		`- LogTail = logs,`
`45`		`- GroupHash = error.Hash,`
`46`		`- Time = MonotonicUnixTime.Now,`
`47`		`- LaunchTime = WatchDog.LaunchTime`
`48`		`- };`
	`31`	`+ var hashBuilder = new StringBuilder();`
	`32`	`+ var error = CreateModelExceptionAndBinaries(exception, hashBuilder);`
`49`	`33`
`50`		`- return JsonSerializer.Serialize(report, ErrorJsonContext.Default.ErrorReport);`
	`34`	`+ return Serialize(error, id, userId, logs, hashBuilder);`
`51`	`35`	`}`
`52`	`36`
`53`	`37`	`public static string Serialize(FatalError exception, string id, string userId, string logs)`
`54`	`38`	`{`
`55`		`- var error = CreateModelExceptionAndBinaries(exception);`
	`39`	`+ var hashBuilder = new StringBuilder();`
	`40`	`+ var error = CreateModelExceptionAndBinaries(exception, hashBuilder);`
	`41`	`+`
	`42`	`+ return Serialize(error, id, userId, logs, hashBuilder);`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ private static string Serialize(ErrorExceptionAndBinaries error, string id, string userId, string logs, StringBuilder hashBuilder)`
	`46`	`+ {`
`56`	`47`	`var report = new ErrorReport`
`57`	`48`	`{`
`58`	`49`	`Id = id,`
`@@ -66,39 +57,37 @@ public static string Serialize(FatalError exception, string id, string userId, s`
`66`	`57`	`ExitPoint = error.Exception.StackTrace,`
`67`	`58`	`StackTrace = error,`
`68`	`59`	`LogTail = logs,`
`69`		`- GroupHash = error.Hash,`
`70`	`60`	`Time = MonotonicUnixTime.Now,`
`71`	`61`	`LaunchTime = WatchDog.LaunchTime`
`72`	`62`	`};`
`73`	`63`
	`64`	`+ hashBuilder.Append(report.ApplicationVersion);`
	`65`	`+ report.GroupHash = ComputeHash(hashBuilder.ToString());`
	`66`	`+`
`74`	`67`	`return JsonSerializer.Serialize(report, ErrorJsonContext.Default.ErrorReport);`
`75`	`68`	`}`
`76`	`69`
`77`		`- public static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(System.Exception exception)`
	`70`	`+ private static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(System.Exception exception, StringBuilder hashBuilder)`
`78`	`71`	`{`
`79`	`72`	`var binaries = new Dictionary<long, ExceptionBinary>();`
`80`		`- var hashBuilder = new StringBuilder();`
`81`	`73`	`var modelException = ProcessException(exception, null, binaries, hashBuilder);`
`82`	`74`
`83`	`75`	`return new ErrorExceptionAndBinaries`
`84`	`76`	`{`
`85`	`77`	`Binaries = binaries.Count > 0 ? binaries.Values.ToList() : null,`
`86`		`- Exception = modelException,`
`87`		`- Hash = ComputeHash(hashBuilder.ToString())`
	`78`	`+ Exception = modelException`
`88`	`79`	`};`
`89`	`80`	`}`
`90`	`81`
`91`		`- public static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(FatalError exception)`
	`82`	`+ private static ErrorExceptionAndBinaries CreateModelExceptionAndBinaries(FatalError exception, StringBuilder hashBuilder)`
`92`	`83`	`{`
`93`	`84`	`var binaries = new Dictionary<long, ExceptionBinary>();`
`94`		`- var hashBuilder = new StringBuilder();`
`95`	`85`	`var modelException = ProcessException(exception, binaries, hashBuilder);`
`96`	`86`
`97`	`87`	`return new ErrorExceptionAndBinaries`
`98`	`88`	`{`
`99`	`89`	`Binaries = binaries.Count > 0 ? binaries.Values.ToList() : null,`
`100`		`- Exception = modelException,`
`101`		`- Hash = ComputeHash(hashBuilder.ToString())`
	`90`	`+ Exception = modelException`
`102`	`91`	`};`
`103`	`92`	`}`
`104`	`93`
`@@ -179,7 +168,7 @@ void AppendHash(ExceptionBinary binary)`
`179`	`168`	`}`
`180`	`169`	`else`
`181`	`170`	`{`
`182`		`- hashBuilder.Append(binary.StartAddress);`
	`171`	`+ hashBuilder.Append(binary.Name);`
`183`	`172`	`}`
`184`	`173`	`}`
`185`	`174`
`@@ -245,7 +234,7 @@ void AppendHash(ExceptionBinary binary)`
`245`	`234`	`}`
`246`	`235`	`else`
`247`	`236`	`{`
`248`		`- hashBuilder.Append(binary.StartAddress);`
	`237`	`+ hashBuilder.Append(binary.Name);`
`249`	`238`	`}`
`250`	`239`	`}`
`251`	`240`
`@@ -657,9 +646,6 @@ public partial class ErrorExceptionAndBinaries`
`657`	`646`
`658`	`647`	`[JsonPropertyName("exception")]`
`659`	`648`	`public ExceptionModel Exception { get; set; }`
`660`		`-`
`661`		`- [JsonIgnore]`
`662`		`- public string Hash { get; set; }`
`663`	`649`	`}`
`664`	`650`
`665`	`651`	`public partial class ExceptionModel`