From 66f68093f066f0bc9d713ed73c39f560c5192d7c Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefan.ceriu@gmail.com>
Date: Mon, 10 Aug 2026 13:00:20 +0300
Subject: [PATCH] Remove the `createSpan` method entirely

As it's easier to live without it than to deal with the API redesign or or misuse
panics.
---
 ElementX/Sources/Other/Extensions/URL.swift   |  6 -----
 ElementX/Sources/Other/Logging/MXLog.swift    | 22 -------------------
 .../RoomSummary/RoomSummaryProvider.swift     |  9 --------
 .../Timeline/TimelineItemProvider.swift       |  6 -----
 4 files changed, 43 deletions(-)

diff --git a/ElementX/Sources/Other/Extensions/URL.swift b/ElementX/Sources/Other/Extensions/URL.swift
index d776a374d..14336ce8b 100644
--- a/ElementX/Sources/Other/Extensions/URL.swift
+++ b/ElementX/Sources/Other/Extensions/URL.swift
@@ -94,12 +94,6 @@ nonisolated extension URL {
     }
     
     var globalProxy: String? {
-        let span = MXLog.createSpan("Global proxy")
-        span.enter()
-        defer {
-            span.exit()
-        }
-        
         guard let proxySettings = CFNetworkCopySystemProxySettings()?.takeRetainedValue() else {
             MXLog.error("Failed retrieving proxy settings")
             return nil
diff --git a/ElementX/Sources/Other/Logging/MXLog.swift b/ElementX/Sources/Other/Logging/MXLog.swift
index 8f4cf9d04..43f43c9ad 100644
--- a/ElementX/Sources/Other/Logging/MXLog.swift
+++ b/ElementX/Sources/Other/Logging/MXLog.swift
@@ -23,14 +23,6 @@ nonisolated enum MXLog {
         rootSpan.enter()
     }
     
-    static func createSpan(_ name: String,
-                           file: String = #file,
-                           function: String = #function,
-                           line: Int = #line,
-                           column: Int = #column) -> Span {
-        createSpan(name, level: .info, file: file, function: function, line: line, column: column)
-    }
-    
     static func verbose(_ message: Any,
                         file: String = #file,
                         function: String = #function,
@@ -112,20 +104,6 @@ nonisolated enum MXLog {
     
     // MARK: - Private
     
-    // periphery:ignore:parameters function,column
-    private static func createSpan(_ name: String,
-                                   level: LogLevel,
-                                   file: String = #file,
-                                   function: String = #function,
-                                   line: Int = #line,
-                                   column: Int = #column) -> Span {
-        if Span.current().isNone() {
-            rootSpan.enter()
-        }
-        
-        return Span(file: file, line: UInt32(line), level: level.rustLogLevel, target: currentTarget, name: name, bridgeTraceId: nil)
-    }
-    
     // periphery:ignore:parameters function,column
     private static func log(_ message: Any,
                             level: LogLevel,
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
index 74431a5cd..e60eeb20e 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
@@ -251,15 +251,6 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
             return currentItems
         }
         
-        // The span guard is thread local, so it must not straddle a suspension
-        // point, otherwise the task could resume on a different thread and
-        // unbalance it, causing a panic and subsequent (intentional) crash.
-        let span = MXLog.createSpan("\(name).apply_room_list_diff")
-        span.enter()
-        defer {
-            span.exit()
-        }
-        
         guard let updatedItems = currentItems.applying(collectionDiff) else {
             MXLog.error("\(name): Failed applying diff: \(collectionDiff)")
             return currentItems
diff --git a/ElementX/Sources/Services/Timeline/TimelineItemProvider.swift b/ElementX/Sources/Services/Timeline/TimelineItemProvider.swift
index 7a7a6631c..9e24409af 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItemProvider.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItemProvider.swift
@@ -99,12 +99,6 @@ class TimelineItemProvider: TimelineItemProviderProtocol {
     private static func processDiffs(_ diffs: [TimelineDiff],
                                      on currentItems: [TimelineItemProxy],
                                      spanName: String) async -> (itemProxies: [TimelineItemProxy], hasMembershipChange: Bool) {
-        let span = MXLog.createSpan(spanName)
-        span.enter()
-        defer {
-            span.exit()
-        }
-        
         var hasMembershipChange = false
         
         let itemProxies = diffs.reduce(currentItems) { currentItems, diff in