From 9d4fa137afd851b956ce786bfb18d4d218ed6eeb Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 26 Aug 2022 15:00:28 +0100 Subject: [PATCH 1/6] Measure performance in Sentry --- Riot/Modules/Analytics/Analytics.swift | 4 ++++ Riot/Modules/Analytics/SentryMonitoringClient.swift | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Riot/Modules/Analytics/Analytics.swift b/Riot/Modules/Analytics/Analytics.swift index 631ea4277..b608c862e 100644 --- a/Riot/Modules/Analytics/Analytics.swift +++ b/Riot/Modules/Analytics/Analytics.swift @@ -338,6 +338,10 @@ extension Analytics: MXAnalyticsDelegate { capture(event: event) } + func startDurationTracking(forName name: String, operation: String) -> StopDurationTracking { + return monitoringClient.startPerformanceTracking(name: name, operation: operation) + } + func trackCallStarted(withVideo isVideo: Bool, numberOfParticipants: Int, incoming isIncoming: Bool) { let event = AnalyticsEvent.CallStarted(isVideo: isVideo, numParticipants: numberOfParticipants, placed: !isIncoming) capture(event: event) diff --git a/Riot/Modules/Analytics/SentryMonitoringClient.swift b/Riot/Modules/Analytics/SentryMonitoringClient.swift index b848c02a9..e296c0d5d 100644 --- a/Riot/Modules/Analytics/SentryMonitoringClient.swift +++ b/Riot/Modules/Analytics/SentryMonitoringClient.swift @@ -34,6 +34,7 @@ struct SentryMonitoringClient { options.dsn = Self.sentryDSN // Collecting only 10% of all events + options.sampleRate = 0.1 options.tracesSampleRate = 0.1 options.beforeSend = { event in @@ -66,4 +67,11 @@ struct SentryMonitoringClient { event.extra = details SentrySDK.capture(event: event) } + + func startPerformanceTracking(name: String, operation: String) -> StopDurationTracking { + let transaction = SentrySDK.startTransaction(name: name, operation: operation) + return { + transaction.finish() + } + } } From e2fb8b25d5b128e286cc4c58a49eaaa81f7070e6 Mon Sep 17 00:00:00 2001 From: Andy Uhnak Date: Fri, 26 Aug 2022 16:36:46 +0100 Subject: [PATCH 2/6] Changelog --- changelog.d/pr-6647.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-6647.change diff --git a/changelog.d/pr-6647.change b/changelog.d/pr-6647.change new file mode 100644 index 000000000..57242e949 --- /dev/null +++ b/changelog.d/pr-6647.change @@ -0,0 +1 @@ +Analytics: Measure performance in Sentry From 24fbb1ae66661c3afea6e7f95574200fff9493eb Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 31 Aug 2022 16:12:01 +0300 Subject: [PATCH 3/6] changelog.d: Upgrade MatrixSDK version ([v0.23.17](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.17)). --- Config/AppVersion.xcconfig | 4 ++-- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index fba787b2a..871e2c3ad 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.9.1 -CURRENT_PROJECT_VERSION = 1.9.1 +MARKETING_VERSION = 1.9.2 +CURRENT_PROJECT_VERSION = 1.9.2 diff --git a/Podfile b/Podfile index 5f856ef64..3c0e4965f 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.23.16' +$matrixSDKVersion = '= 0.23.17' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 000000000..e79e0150a --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.23.17](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.17)). \ No newline at end of file From cb3b709b3949971b09aa42f2bceada896ca5f702 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 31 Aug 2022 16:12:01 +0300 Subject: [PATCH 4/6] version++ --- CHANGES.md | 7 +++++++ changelog.d/x-nolink-0.change | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 988944819..a83041e56 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.9.2 (2022-08-31) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.23.17](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.17)). + + ## Changes in 1.9.1 (2022-08-29) 🙌 Improvements diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index e79e0150a..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.23.17](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.17)). \ No newline at end of file From e6cc12bc511466649643d1724728c17b3fc31985 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 31 Aug 2022 17:26:15 +0300 Subject: [PATCH 5/6] finish version++ --- Podfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 9f096ee4c..a05f20e84 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -56,9 +56,9 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) - - MatrixSDK (0.23.16): - - MatrixSDK/Core (= 0.23.16) - - MatrixSDK/Core (0.23.16): + - MatrixSDK (0.23.17): + - MatrixSDK/Core (= 0.23.17) + - MatrixSDK/Core (0.23.17): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) @@ -66,9 +66,9 @@ PODS: - OLMKit (~> 3.2.5) - Realm (= 10.27.0) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/CryptoSDK (0.23.16): + - MatrixSDK/CryptoSDK (0.23.17): - MatrixSDKCrypto (= 0.1.0) - - MatrixSDK/JingleCallStack (0.23.16): + - MatrixSDK/JingleCallStack (0.23.17): - JitsiMeetSDK (= 5.0.2) - MatrixSDK/Core - MatrixSDKCrypto (0.1.0) @@ -123,8 +123,8 @@ DEPENDENCIES: - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.23.16) - - MatrixSDK/JingleCallStack (= 0.23.16) + - MatrixSDK (= 0.23.17) + - MatrixSDK/JingleCallStack (= 0.23.17) - OLMKit - PostHog (~> 1.4.4) - ReadMoreTextView (~> 3.0.1) @@ -221,7 +221,7 @@ SPEC CHECKSUMS: libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b - MatrixSDK: 522910756169e688afc6ebd12aa549c16bc759dd + MatrixSDK: 82cc75542d5df1da80f68fad1541df7bfb67efb6 MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e OLMKit: da115f16582e47626616874e20f7bb92222c7a51 PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f @@ -241,6 +241,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 32a777fedc1a3ac9b62775803835a9704ef6acdd +PODFILE CHECKSUM: 5c7121d9069b1034690a3c16f6af791167172e53 COCOAPODS: 1.11.2 From 0280b316ac60f010ec8329b256a7085fc1889c45 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 31 Aug 2022 17:26:24 +0300 Subject: [PATCH 6/6] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 871e2c3ad..f5e53ec71 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.9.2 -CURRENT_PROJECT_VERSION = 1.9.2 +MARKETING_VERSION = 1.9.3 +CURRENT_PROJECT_VERSION = 1.9.3