Merge remote-tracking branch 'origin/main' into armcknight/ref/breadc…

…rumb-via-delegate
getsentry · Aug 29, 2023 · 475eb9f · 475eb9f
2 parents fc06dbb + 91d2d63
commit 475eb9f
Show file tree

Hide file tree

Showing 97 changed files with 628 additions and 396 deletions.
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -27,6 +27,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: ./scripts/ci-select-xcode.sh
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Install SentryCli
         run: brew install getsentry/tools/sentry-cli
       - run: git apply ./scripts/set-device-tests-environment.patch
@@ -45,7 +48,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/PerformanceBenchmarks-Runner.app
           key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/PerformanceBenchmarks/**') }}
-      - run: fastlane build_ios_swift_for_tests
+      - run: bundle exec fastlane build_ios_swift_for_tests
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
@@ -54,7 +57,7 @@ jobs:
           MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-      - run: fastlane build_ios_benchmark_test
+      - run: bundle exec fastlane build_ios_benchmark_test
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
@@ -108,7 +111,7 @@ jobs:
           key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ hashFiles('fastlane/Fastfile', 'Tests/Perf/test-app-plain/**') }}
       - name: Build test app plain
         if: steps.app-plain-cache.outputs['cache-hit'] != 'true'
-        run: fastlane build_perf_test_app_plain
+        run: bundle exec fastlane build_perf_test_app_plain
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
@@ -118,7 +121,7 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
       - name: Build test app with sentry
-        run: fastlane build_perf_test_app_sentry
+        run: bundle exec fastlane build_perf_test_app_sentry
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: ./scripts/ci-select-xcode.sh
-
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Run Fastlane
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
@@ -37,7 +39,7 @@ jobs:
           MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-        run: fastlane build_ios_swift
+        run: bundle exec fastlane build_ios_swift
         shell: sh
 
   build-sample:

diff --git a/.github/workflows/profile-data-generator.yml b/.github/workflows/profile-data-generator.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: ./scripts/ci-select-xcode.sh 13.4.1
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Install SentryCli
         run: brew install getsentry/tools/sentry-cli
       - name: Cache Carthage dependencies
@@ -43,7 +46,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/ProfileDataGeneratorUITest-Runner.app
           key: profiledatagenerator-test-runner-app-cache-key-${{ hashFiles('Samples/TrendingMovies/ProfileDataGeneratorUITest/**') }}
-      - run: fastlane build_trending_movies
+      - run: bundle exec fastlane build_trending_movies
         if: steps.cache-trending-movies-app.outputs.cache-hit != 'true'
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
@@ -53,7 +56,7 @@ jobs:
           MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-      - run: fastlane build_profile_data_generator_ui_test
+      - run: bundle exec fastlane build_profile_data_generator_ui_test
         if: steps.cache-profiledatagenerator-test-runner-app.outputs.cache-hit != 'true'
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}

diff --git a/.github/workflows/saucelabs-UI-tests.yml b/.github/workflows/saucelabs-UI-tests.yml
@@ -39,6 +39,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}}
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Install SentryCli
         run: brew install getsentry/tools/sentry-cli
       - run: git apply ./scripts/set-device-tests-environment.patch
@@ -57,7 +60,7 @@ jobs:
           path: |
             DerivedData/Build/Products/Test-iphoneos/iOS-SwiftUITests-Runner.app
           key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-SwiftUITests/**') }}-Xcode-${{ matrix.xcode }}
-      - run: fastlane build_ios_swift_for_tests
+      - run: bundle exec fastlane build_ios_swift_for_tests
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
@@ -66,7 +69,7 @@ jobs:
           MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-      - run: fastlane build_ios_swift_ui_test
+      - run: bundle exec fastlane build_ios_swift_ui_test
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}

diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -22,7 +22,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: ./scripts/ci-select-xcode.sh
-      - run: bundle install
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       # We upload a new version to TestFlight on every commit on main
       # So we need to bump the build number each time

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+- Distributed tracing without performance (#3196)
+
+### Features
+
 ## 8.10.0
 
 ### Features

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.6)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -216,7 +216,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    minitest (5.19.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)

diff --git a/Samples/TrendingMovies/Cartfile b/Samples/TrendingMovies/Cartfile
@@ -1,3 +1,2 @@
 github "onevcat/Kingfisher" == 5.9.0
-github "BeauNouvelle/FaceAware" ~> 2.1.1
 github "indragiek/TUSafariActivity" "master"
diff --git a/Samples/TrendingMovies/Cartfile.resolved b/Samples/TrendingMovies/Cartfile.resolved
@@ -1,3 +1,2 @@
-github "BeauNouvelle/FaceAware" "2.1.1"
 github "indragiek/TUSafariActivity" "74b9c9959129b1297225cd790f9221cbb6fd5695"
 github "onevcat/Kingfisher" "5.9.0"
diff --git a/Samples/TrendingMovies/TrendingMovies.xcodeproj/project.pbxproj b/Samples/TrendingMovies/TrendingMovies.xcodeproj/project.pbxproj
@@ -58,8 +58,6 @@
 		844A3561282B2B9B00C6D1DF /* VideoCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844A352D282B2B9B00C6D1DF /* VideoCollectionViewCell.swift */; };
 		844A3574282B4B6500C6D1DF /* TUSafariActivity.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3570282B4B6500C6D1DF /* TUSafariActivity.xcframework */; };
 		844A3575282B4B6500C6D1DF /* TUSafariActivity.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3570282B4B6500C6D1DF /* TUSafariActivity.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		844A3576282B4B6500C6D1DF /* FaceAware.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3571282B4B6500C6D1DF /* FaceAware.xcframework */; };
-		844A3577282B4B6500C6D1DF /* FaceAware.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3571282B4B6500C6D1DF /* FaceAware.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		844A3578282B4B6500C6D1DF /* Kingfisher.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3572282B4B6500C6D1DF /* Kingfisher.xcframework */; };
 		844A3579282B4B6500C6D1DF /* Kingfisher.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3572282B4B6500C6D1DF /* Kingfisher.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		844A357A282B4B6500C6D1DF /* KingfisherSwiftUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 844A3573282B4B6500C6D1DF /* KingfisherSwiftUI.xcframework */; };
@@ -70,6 +68,34 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		039F53352A96A5660034F766 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 844A3565282B3E4500C6D1DF /* Sentry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D81A3488291D0AC0005A27A9;
+			remoteInfo = SentryPrivate;
+		};
+		039F53372A96A5660034F766 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 844A3565282B3E4500C6D1DF /* Sentry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D8199DAA29376E9B0074249E;
+			remoteInfo = SentrySwiftUI;
+		};
+		039F53392A96A5660034F766 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 844A3565282B3E4500C6D1DF /* Sentry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8431EFD929B27B1100D8DC56;
+			remoteInfo = SentryProfilerTests;
+		};
+		039F533B2A96A5660034F766 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 844A3565282B3E4500C6D1DF /* Sentry.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8431F00A29B284F200D8DC56;
+			remoteInfo = SentryTestUtils;
+		};
 		844A356A282B3E4500C6D1DF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 844A3565282B3E4500C6D1DF /* Sentry.xcodeproj */;
@@ -104,7 +130,6 @@
 				844A357B282B4B6500C6D1DF /* KingfisherSwiftUI.xcframework in Embed Frameworks */,
 				844A3575282B4B6500C6D1DF /* TUSafariActivity.xcframework in Embed Frameworks */,
 				844A359D282DAA6100C6D1DF /* Sentry.framework in Embed Frameworks */,
-				844A3577282B4B6500C6D1DF /* FaceAware.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -183,7 +208,6 @@
 				844A357A282B4B6500C6D1DF /* KingfisherSwiftUI.xcframework in Frameworks */,
 				844A3574282B4B6500C6D1DF /* TUSafariActivity.xcframework in Frameworks */,
 				844A359C282DAA6100C6D1DF /* Sentry.framework in Frameworks */,
-				844A3576282B4B6500C6D1DF /* FaceAware.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -390,6 +414,10 @@
 			children = (
 				844A356B282B3E4500C6D1DF /* Sentry.framework */,
 				844A356D282B3E4500C6D1DF /* SentryTests.xctest */,
+				039F53362A96A5660034F766 /* SentryPrivate.framework */,
+				039F53382A96A5660034F766 /* SentrySwiftUI.framework */,
+				039F533A2A96A5660034F766 /* SentryProfilerTests.xctest */,
+				039F533C2A96A5660034F766 /* libSentryTestUtils.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -498,6 +526,34 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		039F53362A96A5660034F766 /* SentryPrivate.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SentryPrivate.framework;
+			remoteRef = 039F53352A96A5660034F766 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		039F53382A96A5660034F766 /* SentrySwiftUI.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SentrySwiftUI.framework;
+			remoteRef = 039F53372A96A5660034F766 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		039F533A2A96A5660034F766 /* SentryProfilerTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = SentryProfilerTests.xctest;
+			remoteRef = 039F53392A96A5660034F766 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		039F533C2A96A5660034F766 /* libSentryTestUtils.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libSentryTestUtils.a;
+			remoteRef = 039F533B2A96A5660034F766 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		844A356B282B3E4500C6D1DF /* Sentry.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;

diff --git a/Samples/TrendingMovies/TrendingMovies/Credits/CreditCollectionViewCell.swift b/Samples/TrendingMovies/TrendingMovies/Credits/CreditCollectionViewCell.swift
@@ -1,4 +1,3 @@
-import FaceAware
 import Kingfisher
 import UIKit
 
@@ -19,9 +18,9 @@ class CreditCollectionViewCell: UICollectionViewCell {
     var profileImage: UIImage? {
         didSet {
             if let profileImage = profileImage {
-                profileImageView.set(image: profileImage, focusOnFaces: true)
+                profileImageView.image = profileImage
             } else {
-                profileImageView.set(image: UIImage(named: CreditCollectionViewCell.placeholderImageName), focusOnFaces: false)
+                profileImageView.image = UIImage(named: CreditCollectionViewCell.placeholderImageName)
             }
         }
     }

diff --git a/Samples/TrendingMovies/TrendingMovies/Movies/MovieCollectionViewCell.swift b/Samples/TrendingMovies/TrendingMovies/Movies/MovieCollectionViewCell.swift
@@ -155,7 +155,7 @@ class MovieCollectionViewCell: UICollectionViewCell {
 private func blurPosterImage(_ image: UIImage, completion: @escaping (UIImage?) -> Void) {
     let efficiently = ProcessInfo.processInfo.arguments.contains("--io.sentry.sample.trending-movies.launch-arg.efficient-implementation")
     func performBlur() {
-        let blurredImage = ImageEffects.createBlurredBackdrop(image: image, downsamplingFactor: 1.0, blurRadius: 20.0, tintColor: nil, saturationDeltaFactor: 2.0)
+        let blurredImage = ImageEffects.createBlurredBackdrop(image: image, downsamplingFactor: 0.87, blurRadius: 20.0, tintColor: nil, saturationDeltaFactor: 2.0)
         if efficiently {
             DispatchQueue.main.async {
                 completion(blurredImage)