Merge branch 'armcknight/feat/3555-continuous-profiling/5-implementat…

…ion/3-automatic-start-stop' into armcknight/feat/3555-continuous-profiling/5-implementation/4-launch-profiling
getsentry · May 14, 2024 · 8a829a6 · 8a829a6
2 parents 48959ff + d0c8e78
commit 8a829a6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/SentryTestUtils/ClearTestState.swift b/SentryTestUtils/ClearTestState.swift
@@ -41,6 +41,7 @@ class TestCleanup: NSObject {
 #if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
         SentryLegacyProfiler.getCurrentProfiler()?.stop(for: SentryProfilerTruncationReason.normal)
         SentryLegacyProfiler.resetConcurrencyTracking()
+        SentryContinuousProfiler.stop()
 #endif // os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
 
         #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)

diff --git a/SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h b/SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h
@@ -17,6 +17,7 @@
 #import "SentryProfilingConditionals.h"
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
+#    import "SentryContinuousProfiler.h"
 #    import "SentryLegacyProfiler+Test.h"
 #    import "SentryProfiler+Private.h"
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED

diff --git a/Tests/SentryProfilerTests/SentryContinuousProfilerTests.swift b/Tests/SentryProfilerTests/SentryContinuousProfilerTests.swift
@@ -24,11 +24,6 @@ final class SentryContinuousProfilerTests: XCTestCase {
         clearTestState()
     }
 
-    override func tearDown() {
-        super.tearDown()
-        SentryContinuousProfiler.stop()
-    }
-
     func testStartingAndStoppingContinuousProfiler() throws {
         try performContinuousProfilingTest()
     }