Skip to content

Commit 9f3a8a4

Browse files
committed
Merge branch 'master' into feat/2148-tracePropagationTargets
* master: release: 7.26.0 meta: Fix Changelog concurrent transactions (#2229) build(deps): bump fastlane from 2.210.0 to 2.210.1 (#2224) Revert "feat: profile concurrent transactions (#2105)" (#2225) fix: Align core data span operations (#2222) test: Remove empty assert msg for AppStateTests (#2221) meta: Fix Changelog (#2219) ref: Add typealias for bytes (#2209) feat: profile concurrent transactions (#2105) ci: Readd cache for UI tests (#2215) # Conflicts: # Sentry.xcodeproj/project.pbxproj
2 parents 5f7468b + 7138b7d commit 9f3a8a4

24 files changed

+338
-351
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## Unreleased
3+
## 7.26.0
44

55
### Features
66

@@ -15,6 +15,7 @@
1515
- Sentry-trace header incorrectly assigned to http requests (#2167)
1616
- Use the `component` name source for SentryPerformanceTracker (#2168)
1717
- Add support for arm64 architecture to the device context (#2185)
18+
- Align core data span operations (#2222)
1819

1920
## 7.25.1
2021

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ GEM
1717
artifactory (3.0.15)
1818
atomos (0.1.3)
1919
aws-eventstream (1.2.0)
20-
aws-partitions (1.631.0)
21-
aws-sdk-core (3.148.0)
20+
aws-partitions (1.636.0)
21+
aws-sdk-core (3.154.0)
2222
aws-eventstream (~> 1, >= 1.0.2)
2323
aws-partitions (~> 1, >= 1.525.0)
2424
aws-sigv4 (~> 1.1)
@@ -86,7 +86,7 @@ GEM
8686
escape (0.0.4)
8787
ethon (0.15.0)
8888
ffi (>= 1.15.0)
89-
excon (0.92.4)
89+
excon (0.92.5)
9090
faraday (1.10.2)
9191
faraday-em_http (~> 1.0)
9292
faraday-em_synchrony (~> 1.0)
@@ -116,7 +116,7 @@ GEM
116116
faraday_middleware (1.2.0)
117117
faraday (~> 1.0)
118118
fastimage (2.2.6)
119-
fastlane (2.210.0)
119+
fastlane (2.210.1)
120120
CFPropertyList (>= 2.3, < 4.0.0)
121121
addressable (>= 2.8, < 3.0.0)
122122
artifactory (~> 3.0)
@@ -161,9 +161,9 @@ GEM
161161
fourflusher (2.3.1)
162162
fuzzy_match (2.0.4)
163163
gh_inspector (1.1.3)
164-
google-apis-androidpublisher_v3 (0.26.0)
165-
google-apis-core (>= 0.7, < 2.a)
166-
google-apis-core (0.7.2)
164+
google-apis-androidpublisher_v3 (0.28.0)
165+
google-apis-core (>= 0.9.0, < 2.a)
166+
google-apis-core (0.9.0)
167167
addressable (~> 2.5, >= 2.5.1)
168168
googleauth (>= 0.16.2, < 2.a)
169169
httpclient (>= 2.8.1, < 3.a)
@@ -172,10 +172,10 @@ GEM
172172
retriable (>= 2.0, < 4.a)
173173
rexml
174174
webrick
175-
google-apis-iamcredentials_v1 (0.13.0)
176-
google-apis-core (>= 0.7, < 2.a)
177-
google-apis-playcustomapp_v1 (0.10.0)
178-
google-apis-core (>= 0.7, < 2.a)
175+
google-apis-iamcredentials_v1 (0.15.0)
176+
google-apis-core (>= 0.9.0, < 2.a)
177+
google-apis-playcustomapp_v1 (0.11.0)
178+
google-apis-core (>= 0.9.0, < 2.a)
179179
google-apis-storage_v1 (0.17.0)
180180
google-apis-core (>= 0.7, < 2.a)
181181
google-cloud-core (1.6.0)
@@ -184,7 +184,7 @@ GEM
184184
google-cloud-env (1.6.0)
185185
faraday (>= 0.17.3, < 3.0)
186186
google-cloud-errors (1.3.0)
187-
google-cloud-storage (1.40.0)
187+
google-cloud-storage (1.42.0)
188188
addressable (~> 2.8)
189189
digest-crc (~> 0.4)
190190
google-apis-iamcredentials_v1 (~> 0.1)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@
10821082
"$(inherited)",
10831083
"@executable_path/Frameworks",
10841084
);
1085-
MARKETING_VERSION = 7.25.1;
1085+
MARKETING_VERSION = 7.26.0;
10861086
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
10871087
PRODUCT_NAME = "$(TARGET_NAME)";
10881088
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1111,7 +1111,7 @@
11111111
"$(inherited)",
11121112
"@executable_path/Frameworks",
11131113
);
1114-
MARKETING_VERSION = 7.25.1;
1114+
MARKETING_VERSION = 7.26.0;
11151115
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
11161116
PRODUCT_NAME = "$(TARGET_NAME)";
11171117
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1310,7 +1310,7 @@
13101310
"$(inherited)",
13111311
"@executable_path/Frameworks",
13121312
);
1313-
MARKETING_VERSION = 7.25.1;
1313+
MARKETING_VERSION = 7.26.0;
13141314
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
13151315
PRODUCT_NAME = "$(TARGET_NAME)";
13161316
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1345,7 +1345,7 @@
13451345
"$(inherited)",
13461346
"@executable_path/Frameworks",
13471347
);
1348-
MARKETING_VERSION = 7.25.1;
1348+
MARKETING_VERSION = 7.26.0;
13491349
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
13501350
PRODUCT_NAME = "$(TARGET_NAME)";
13511351
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";

Sentry.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Sentry"
3-
s.version = "7.25.1"
3+
s.version = "7.26.0"
44
s.summary = "Sentry client for cocoa"
55
s.homepage = "https://github.com/getsentry/sentry-cocoa"
66
s.license = "mit"

Sentry.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
0A9BF4E428A114B50068D266 /* SentryViewHierarchyIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A9BF4E328A114B50068D266 /* SentryViewHierarchyIntegration.h */; };
5656
0A9BF4E928A125390068D266 /* TestSentryViewHierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9BF4E628A123270068D266 /* TestSentryViewHierarchy.swift */; };
5757
0A9BF4EB28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9BF4EA28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift */; };
58+
0A9E917128DC7E7000FB4182 /* SentryInternalDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A9E917028DC7E7000FB4182 /* SentryInternalDefines.h */; };
5859
0AABE2ED2885924A0057ED69 /* SentryPermissionsObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AABE2EC2885924A0057ED69 /* SentryPermissionsObserver.m */; };
5960
0ACBA10128A6406400D711F7 /* UIView+Sentry.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ACBA10028A6406400D711F7 /* UIView+Sentry.m */; };
6061
0ACBA10328A6407200D711F7 /* UIView+Sentry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0ACBA10228A6407200D711F7 /* UIView+Sentry.h */; };
@@ -758,6 +759,7 @@
758759
0A9BF4E628A123270068D266 /* TestSentryViewHierarchy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryViewHierarchy.swift; sourceTree = "<group>"; };
759760
0A9BF4EA28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyIntegrationTests.swift; sourceTree = "<group>"; };
760761
0AA0F74328E2FCD900AB840C /* SentryNetworkTracker+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryNetworkTracker+Private.h"; sourceTree = "<group>"; };
762+
0A9E917028DC7E7000FB4182 /* SentryInternalDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryInternalDefines.h; path = include/SentryInternalDefines.h; sourceTree = "<group>"; };
761763
0AABE2EC2885924A0057ED69 /* SentryPermissionsObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryPermissionsObserver.m; sourceTree = "<group>"; };
762764
0AABE2EE288592750057ED69 /* SentryPermissionsObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryPermissionsObserver.h; path = include/SentryPermissionsObserver.h; sourceTree = "<group>"; };
763765
0AABE2EF2885C2120057ED69 /* TestSentryPermissionsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryPermissionsObserver.swift; sourceTree = "<group>"; };
@@ -1809,6 +1811,7 @@
18091811
7B2A70DC27D6083D008B0D15 /* SentryThreadWrapper.m */,
18101812
7B18DE3F28D9F748004845C6 /* SentryNSNotificationCenterWrapper.h */,
18111813
7B18DE4128D9F794004845C6 /* SentryNSNotificationCenterWrapper.m */,
1814+
0A9E917028DC7E7000FB4182 /* SentryInternalDefines.h */,
18121815
);
18131816
name = Helper;
18141817
sourceTree = "<group>";
@@ -2959,6 +2962,7 @@
29592962
D8479328278873A100BE8E99 /* SentryByteCountFormatter.h in Headers */,
29602963
63AA76981EB9C1C200D153DE /* SentryClient.h in Headers */,
29612964
63AA76971EB9C1C200D153DE /* Sentry.h in Headers */,
2965+
0A9E917128DC7E7000FB4182 /* SentryInternalDefines.h in Headers */,
29622966
63FE711F20DA4C1000CDBAE8 /* SentryCrashObjC.h in Headers */,
29632967
7BC3936825B1AB3E004F03D3 /* SentryLevelMapper.h in Headers */,
29642968
8E4E7C6E25DAAAFE006AB9E2 /* SentrySpan.h in Headers */,

Sources/Configuration/Sentry.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ MACH_O_TYPE = mh_dylib
2929
FRAMEWORK_VERSION = A
3030

3131
PRODUCT_NAME = Sentry
32-
CURRENT_PROJECT_VERSION = 7.25.1
32+
CURRENT_PROJECT_VERSION = 7.26.0
3333
INFOPLIST_FILE = Sources/Sentry/Info.plist
3434
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry
3535
ALWAYS_SEARCH_USER_PATHS = NO

Sources/Sentry/SentryClient.m

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -768,35 +768,35 @@ - (void)applyCultureContextToEvent:(SentryEvent *)event
768768

769769
- (void)applyExtraDeviceContextToEvent:(SentryEvent *)event
770770
{
771-
[self modifyContext:event
772-
key:@"device"
773-
block:^(NSMutableDictionary *device) {
774-
device[SentryDeviceContextFreeMemoryKey] = @(self.crashWrapper.freeMemory);
775-
device[@"free_storage"] = @(self.crashWrapper.freeStorage);
771+
[self
772+
modifyContext:event
773+
key:@"device"
774+
block:^(NSMutableDictionary *device) {
775+
device[SentryDeviceContextFreeMemoryKey] = @(self.crashWrapper.freeMemorySize);
776+
device[@"free_storage"] = @(self.crashWrapper.freeStorageSize);
776777

777778
#if TARGET_OS_IOS
778-
if (self.deviceWrapper.orientation != UIDeviceOrientationUnknown) {
779-
device[@"orientation"]
780-
= UIDeviceOrientationIsPortrait(self.deviceWrapper.orientation)
781-
? @"portrait"
782-
: @"landscape";
783-
}
784-
785-
if (self.deviceWrapper.isBatteryMonitoringEnabled) {
786-
device[@"charging"]
787-
= self.deviceWrapper.batteryState == UIDeviceBatteryStateCharging
788-
? @(YES)
789-
: @(NO);
790-
device[@"battery_level"] =
791-
@((int)(self.deviceWrapper.batteryLevel * 100));
792-
}
779+
if (self.deviceWrapper.orientation != UIDeviceOrientationUnknown) {
780+
device[@"orientation"]
781+
= UIDeviceOrientationIsPortrait(self.deviceWrapper.orientation)
782+
? @"portrait"
783+
: @"landscape";
784+
}
785+
786+
if (self.deviceWrapper.isBatteryMonitoringEnabled) {
787+
device[@"charging"]
788+
= self.deviceWrapper.batteryState == UIDeviceBatteryStateCharging
789+
? @(YES)
790+
: @(NO);
791+
device[@"battery_level"] = @((int)(self.deviceWrapper.batteryLevel * 100));
792+
}
793793
#endif
794-
}];
794+
}];
795795

796796
[self modifyContext:event
797797
key:@"app"
798798
block:^(NSMutableDictionary *app) {
799-
app[SentryDeviceContextAppMemoryKey] = @(self.crashWrapper.appMemory);
799+
app[SentryDeviceContextAppMemoryKey] = @(self.crashWrapper.appMemorySize);
800800
}];
801801
}
802802

Sources/Sentry/SentryCrashIntegration.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ + (void)enrichScope:(SentryScope *)scope crashWrapper:(SentryCrashWrapper *)cras
249249
[deviceData setValue:systemInfo[@"cpuArchitecture"] forKey:@"arch"];
250250
[deviceData setValue:systemInfo[@"machine"] forKey:@"model"];
251251
[deviceData setValue:systemInfo[@"model"] forKey:@"model_id"];
252-
[deviceData setValue:systemInfo[@"freeMemory"] forKey:SentryDeviceContextFreeMemoryKey];
253-
[deviceData setValue:systemInfo[@"usableMemory"] forKey:@"usable_memory"];
252+
[deviceData setValue:systemInfo[@"freeMemorySize"] forKey:SentryDeviceContextFreeMemoryKey];
253+
[deviceData setValue:systemInfo[@"usableMemorySize"] forKey:@"usable_memory"];
254254
[deviceData setValue:systemInfo[@"memorySize"] forKey:@"memory_size"];
255255
[deviceData setValue:systemInfo[@"totalStorageSize"] forKey:@"storage_size"];
256256
[deviceData setValue:systemInfo[@"freeStorageSize"] forKey:@"free_storage"];

Sources/Sentry/SentryCrashWrapper.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ - (NSDictionary *)systemInfo
7171
return sharedInfo;
7272
}
7373

74-
- (uint64_t)freeMemory
74+
- (bytes)freeMemorySize
7575
{
76-
return sentrycrashcm_system_freememory();
76+
return sentrycrashcm_system_freememory_size();
7777
}
7878

79-
- (uint64_t)freeStorage
79+
- (bytes)freeStorageSize
8080
{
81-
return sentrycrashcm_system_freestorage();
81+
return sentrycrashcm_system_freestorage_size();
8282
}
8383

84-
- (uint64_t)appMemory
84+
- (bytes)appMemorySize
8585
{
8686
task_vm_info_data_t info;
8787
mach_msg_type_number_t size = TASK_VM_INFO_COUNT;

Sources/Sentry/SentryMeta.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ @implementation SentryMeta
55
// Don't remove the static keyword. If you do the compiler adds the constant name to the global
66
// symbol table and it might clash with other constants. When keeping the static keyword the
77
// compiler replaces all occurrences with the value.
8-
static NSString *versionString = @"7.25.1";
8+
static NSString *versionString = @"7.26.0";
99
static NSString *sdkName = @"sentry.cocoa";
1010

1111
+ (NSString *)versionString

0 commit comments

Comments
 (0)