fix: synchronize and copy global profiling data structures

.github/workflows/codeql-analysis.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # pin@v2
+        uses: github/codeql-action/init@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # pin@v2
         with:
           languages: ${{ matrix.language }}
 
@@ -37,4 +37,4 @@ jobs:
           -destination platform="iOS Simulator,OS=latest,name=iPhone 11 Pro" | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # pin@v2
+        uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # pin@v2

.github/workflows/test.yml

@@ -194,6 +194,7 @@ jobs:
 
       # We split building and running tests in two steps so we know how long running the tests takes.
       - name: Build tests
+        id: build_tests
         run: ./scripts/xcode-test.sh ${{matrix.platform}} ${{matrix.test-destination-os}} $GITHUB_REF_NAME ci build-for-testing
 
       - name: Run tests
@@ -209,7 +210,7 @@ jobs:
 
       - name: Archiving DerivedData Logs
         uses: actions/upload-artifact@v3
-        if: failure()
+        if: steps.build_tests.outcome == 'failure'
         with:
           name: derived-data-${{matrix.platform}}-xcode-${{matrix.xcode}}-os-${{matrix.test-destination-os}}
           path: |
@@ -251,7 +252,7 @@ jobs:
       - name: Push code coverage to codecov
         id: codecov_2
         uses: codecov/codecov-action@894ff025c7b54547a9a2a1e9f228beae737ad3c2 # pin@v3.1.3
-        if: steps.codecov_1.outcome == 'failure' && ${{ contains(matrix.platform, 'iOS') && !contains(github.ref, 'release') && github.event.schedule == '' }}
+        if: ${{ steps.codecov_1.outcome == 'failure' && contains(matrix.platform, 'iOS') && !contains(github.ref, 'release') && github.event.schedule == '' }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### Fixed
+
+- Fix crashes in profiling serialization race condition (#3018)
+
+## 8.7.0
+
 ### Features
 
 - Allow starting the SDK with an initial scope (#2982)

Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj

@@ -1190,7 +1190,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1219,7 +1219,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1864,7 +1864,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1899,7 +1899,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 8.6.0;
+				MARKETING_VERSION = 8.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";

Sentry.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sentry"
-  s.version      = "8.6.0"
+  s.version      = "8.7.0"
   s.summary      = "Sentry client for cocoa"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   }
 
   s.default_subspecs = ['Core']
-  s.dependency "SentryPrivate", "8.6.0"
+  s.dependency "SentryPrivate", "8.7.0"
 
   s.subspec 'Core' do |sp|
       sp.source_files = "Sources/Sentry/**/*.{h,hpp,m,mm,c,cpp}",

SentryPrivate.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentryPrivate"
-  s.version      = "8.6.0"
+  s.version      = "8.7.0"
   s.summary      = "Sentry Private Library."
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"

SentrySwiftUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentrySwiftUI"
-  s.version      = "8.6.0"
+  s.version      = "8.7.0"
   s.summary      = "Sentry client for SwiftUI"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.watchos.framework = 'WatchKit'
 
   s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
-  s.dependency 'Sentry', "8.6.0"
+  s.dependency 'Sentry', "8.7.0"
 end

Sources/Configuration/Sentry.xcconfig

@@ -2,6 +2,6 @@ PRODUCT_NAME = Sentry
 INFOPLIST_FILE = Sources/Sentry/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry
 
-CURRENT_PROJECT_VERSION = 8.6.0
+CURRENT_PROJECT_VERSION = 8.7.0
 
 MODULEMAP_FILE = $(SRCROOT)/Sources/Sentry/Sentry.modulemap

Sources/Configuration/SentryPrivate.xcconfig

@@ -1,3 +1,3 @@
 PRODUCT_NAME = SentryPrivate
 MACH_O_TYPE = staticlib
-CURRENT_PROJECT_VERSION = 8.6.0
+CURRENT_PROJECT_VERSION = 8.7.0

Sources/Sentry/SentryMeta.m

@@ -5,7 +5,7 @@ @implementation SentryMeta
 // Don't remove the static keyword. If you do the compiler adds the constant name to the global
 // symbol table and it might clash with other constants. When keeping the static keyword the
 // compiler replaces all occurrences with the value.
-static NSString *versionString = @"8.6.0";
+static NSString *versionString = @"8.7.0";
 static NSString *sdkName = @"sentry.cocoa";
 
 + (NSString *)versionString

Sources/Sentry/SentryProfileTimeseries.mm

@@ -7,8 +7,6 @@
 #    import "SentryLog.h"
 #    import "SentryTransaction.h"
 
-std::mutex _gSamplesArrayLock;
-
 /**
  * Print a debug log to help diagnose slicing errors.
  * @param start @c YES if this is an attempt to find the start of the sliced data based on the
@@ -44,51 +42,45 @@
 NSArray<SentrySample *> *_Nullable slicedProfileSamples(
     NSArray<SentrySample *> *samples, SentryTransaction *transaction)
 {
-    NSArray<SentrySample *> *samplesCopy;
-    {
-        std::lock_guard<std::mutex> l(_gSamplesArrayLock);
-        samplesCopy = [samples copy];
-    }
-
-    if (samplesCopy.count == 0) {
+    if (samples.count == 0) {
         return nil;
     }
 
     const auto transactionStart = transaction.startSystemTime;
     const auto firstIndex =
-        [samplesCopy indexOfObjectWithOptions:NSEnumerationConcurrent
-                                  passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
-                                      BOOL *_Nonnull stop) {
-                                      *stop = sample.absoluteTimestamp >= transactionStart;
-                                      return *stop;
-                                  }];
+        [samples indexOfObjectWithOptions:NSEnumerationConcurrent
+                              passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
+                                  BOOL *_Nonnull stop) {
+                                  *stop = sample.absoluteTimestamp >= transactionStart;
+                                  return *stop;
+                              }];
 
     if (firstIndex == NSNotFound) {
-        logSlicingFailureWithArray(samplesCopy, transaction, /*start*/ YES);
+        logSlicingFailureWithArray(samples, transaction, /*start*/ YES);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found first slice sample at index %lu", firstIndex);
     }
 
     const auto transactionEnd = transaction.endSystemTime;
     const auto lastIndex =
-        [samplesCopy indexOfObjectWithOptions:NSEnumerationConcurrent | NSEnumerationReverse
-                                  passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
-                                      BOOL *_Nonnull stop) {
-                                      *stop = sample.absoluteTimestamp <= transactionEnd;
-                                      return *stop;
-                                  }];
+        [samples indexOfObjectWithOptions:NSEnumerationConcurrent | NSEnumerationReverse
+                              passingTest:^BOOL(SentrySample *_Nonnull sample, NSUInteger idx,
+                                  BOOL *_Nonnull stop) {
+                                  *stop = sample.absoluteTimestamp <= transactionEnd;
+                                  return *stop;
+                              }];
 
     if (lastIndex == NSNotFound) {
-        logSlicingFailureWithArray(samplesCopy, transaction, /*start*/ NO);
+        logSlicingFailureWithArray(samples, transaction, /*start*/ NO);
         return nil;
     } else {
         SENTRY_LOG_DEBUG(@"Found last slice sample at index %lu", lastIndex);
     }
 
     const auto range = NSMakeRange(firstIndex, (lastIndex - firstIndex) + 1);
     const auto indices = [NSIndexSet indexSetWithIndexesInRange:range];
-    return [samplesCopy objectsAtIndexes:indices];
+    return [samples objectsAtIndexes:indices];
 }
 
 @implementation SentrySample