Skip to content

Commit 69ea418

Browse files
noahsmartinnoahsmartin
authored
Merge 6647ea3 into 7aaa0b6 
2 parents 7aaa0b6 + 6647ea3 commit 69ea418

File tree

54 files changed

+105
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+105
-598
lines changed

‎CHANGELOG-v9.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ Removes deprecated getStoreEndpoint (#5591)
77
Removes deprecated useSpan function (#5591)
88
Removes deprecated SentryDebugImageProvider class (#5598)
99
Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
10-
Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
1110
Removes public SentrySerializable conformance from many public models (#5636, #5840, #5982)
12-
Removes Decodable conformances from the public API of model classes (#5691)
1311
Removes enableTracing property from SentryOptions (#5694)
1412
Removes deprecated `setExtraValue` from SentrySpan (#5864)
1513
Removes `integrations` property from `SentryOptions` (#5749)

‎CHANGELOG.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44

55
### Breaking Changes
66

7-
Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
8-
Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
7+
- Removes Decodable conformances from the public API of model classes (#5691)
8+
- Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
9+
- Removes deprecated TraceContext initializers (#6348)
10+
- Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
11+
- Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
912

1013
### Features
1114

‎Sources/Sentry/Public/SentryBaggage.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ NS_SWIFT_NAME(Baggage)
4040
*/
4141
@property (nullable, nonatomic, readonly) NSString *userId;
4242

43-
/**
44-
* The value of a segment attribute in the user's data bag, if it exists.
45-
*/
46-
#if !SDK_V9
47-
@property (nullable, nonatomic, readonly) NSString *userSegment;
48-
#endif
49-
5043
/**
5144
* The random value used to determine if the trace is sampled.
5245
*
@@ -71,9 +64,6 @@ NS_SWIFT_NAME(Baggage)
7164
releaseName:(nullable NSString *)releaseName
7265
environment:(nullable NSString *)environment
7366
transaction:(nullable NSString *)transaction
74-
#if !SDK_V9
75-
userSegment:(nullable NSString *)userSegment
76-
#endif
7767
sampleRate:(nullable NSString *)sampleRate
7868
sampled:(nullable NSString *)sampled
7969
replayId:(nullable NSString *)replayId;
@@ -83,9 +73,6 @@ NS_SWIFT_NAME(Baggage)
8373
releaseName:(nullable NSString *)releaseName
8474
environment:(nullable NSString *)environment
8575
transaction:(nullable NSString *)transaction
86-
#if !SDK_V9
87-
userSegment:(nullable NSString *)userSegment
88-
#endif
8976
sampleRate:(nullable NSString *)sampleRate
9077
sampleRand:(nullable NSString *)sampleRand
9178
sampled:(nullable NSString *)sampled

‎Sources/Sentry/Public/SentryTraceContext.h‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ NS_SWIFT_NAME(TraceContext)
5050
*/
5151
@property (nullable, nonatomic, readonly) NSString *transaction;
5252

53-
/**
54-
* A subset of the scope's user context.
55-
*/
56-
#if !SDK_V9
57-
@property (nullable, nonatomic, readonly) NSString *userSegment;
58-
#endif
59-
6053
/**
6154
* Serialized sample rate used for this trace.
6255
*/
@@ -85,9 +78,6 @@ NS_SWIFT_NAME(TraceContext)
8578
releaseName:(nullable NSString *)releaseName
8679
environment:(nullable NSString *)environment
8780
transaction:(nullable NSString *)transaction
88-
#if !SDK_V9
89-
userSegment:(nullable NSString *)userSegment
90-
#endif
9181
sampleRate:(nullable NSString *)sampleRate
9282
sampled:(nullable NSString *)sampled
9383
replayId:(nullable NSString *)replayId;
@@ -100,9 +90,6 @@ NS_SWIFT_NAME(TraceContext)
10090
releaseName:(nullable NSString *)releaseName
10191
environment:(nullable NSString *)environment
10292
transaction:(nullable NSString *)transaction
103-
#if !SDK_V9
104-
userSegment:(nullable NSString *)userSegment
105-
#endif
10693
sampleRate:(nullable NSString *)sampleRate
10794
sampleRand:(nullable NSString *)sampleRand
10895
sampled:(nullable NSString *)sampled
@@ -125,29 +112,15 @@ NS_SWIFT_NAME(TraceContext)
125112
scope:(nullable SentryScope *)scope
126113
options:(SentryOptions *)options;
127114

128-
#if SDK_V9
129115
/**
130116
* Initializes a SentryTraceContext with data from a traceId, options and replayId.
131117
*
132118
* @param traceId The current tracer.
133119
* @param options The current active options.
134120
* @param replayId The current session replay.
135121
*/
136-
#else
137-
/**
138-
* Initializes a SentryTraceContext with data from a traceId, options, userSegment and replayId.
139-
*
140-
* @param traceId The current tracer.
141-
* @param options The current active options.
142-
* @param userSegment You can retrieve this usually from the `scope.userObject.segment`.
143-
* @param replayId The current session replay.
144-
*/
145-
#endif
146122
- (instancetype)initWithTraceId:(SentryId *)traceId
147123
options:(SentryOptions *)options
148-
#if !SDK_V9
149-
userSegment:(nullable NSString *)userSegment
150-
#endif
151124
replayId:(nullable NSString *)replayId;
152125

153126
/**

‎Sources/Sentry/Public/SentryTransactionContext.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,6 @@ SENTRY_NO_INIT
6464
*/
6565
- (instancetype)initWithName:(NSString *)name operation:(NSString *)operation;
6666

67-
/**
68-
* @param name Transaction name
69-
* @param operation The operation this span is measuring.
70-
* @param sampled Determines whether the trace should be sampled.
71-
*/
72-
- (instancetype)initWithName:(NSString *)name
73-
operation:(NSString *)operation
74-
sampled:(SentrySampleDecision)sampled
75-
DEPRECATED_MSG_ATTRIBUTE("Use initWithName:operation:sampled:sampleRate:sampleRand instead");
76-
7767
/**
7868
* @param name Transaction name
7969
* @param operation The operation this span is measuring.
@@ -85,24 +75,6 @@ SENTRY_NO_INIT
8575
sampleRate:(nullable NSNumber *)sampleRate
8676
sampleRand:(nullable NSNumber *)sampleRand;
8777

88-
/**
89-
* @param name Transaction name
90-
* @param operation The operation this span is measuring.
91-
* @param traceId Trace Id
92-
* @param spanId Span Id
93-
* @param parentSpanId Parent span id
94-
* @param parentSampled Whether the parent is sampled
95-
*/
96-
- (instancetype)initWithName:(NSString *)name
97-
operation:(NSString *)operation
98-
traceId:(SentryId *)traceId
99-
spanId:(SentrySpanId *)spanId
100-
parentSpanId:(nullable SentrySpanId *)parentSpanId
101-
parentSampled:(SentrySampleDecision)parentSampled
102-
DEPRECATED_MSG_ATTRIBUTE("Use "
103-
"initWithName:operation:traceId:spanId:parentSpanId:parentSampled:"
104-
"parentSampleRate:parentSampleRand instead");
105-
10678
/**
10779
* @param name Transaction name
10880
* @param operation The operation this span is measuring.

‎Sources/Sentry/Public/SentryUser.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ NS_SWIFT_NAME(User)
4141
*/
4242
@property (atomic, copy) NSString *_Nullable ipAddress;
4343

44-
#if !SDK_V9
45-
/**
46-
* The user segment, for apps that divide users in user segments.
47-
* @deprecated This field will be removed in the next major version.
48-
*/
49-
@property (atomic, copy) NSString *_Nullable segment DEPRECATED_MSG_ATTRIBUTE(
50-
"This field is deprecated and will be removed in the next major update.");
51-
#endif // !SDK_V9
52-
5344
/**
5445
* Optional: Human readable name
5546
*/

‎Sources/Sentry/SentryBaggage.m‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
1515
releaseName:(nullable NSString *)releaseName
1616
environment:(nullable NSString *)environment
1717
transaction:(nullable NSString *)transaction
18-
#if !SDK_V9
19-
userSegment:(nullable NSString *)userSegment
20-
#endif
2118
sampleRate:(nullable NSString *)sampleRate
2219
sampled:(nullable NSString *)sampled
2320
replayId:(nullable NSString *)replayId
@@ -27,9 +24,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
2724
releaseName:releaseName
2825
environment:environment
2926
transaction:transaction
30-
#if !SDK_V9
31-
userSegment:userSegment
32-
#endif
3327
sampleRate:sampleRate
3428
sampleRand:nil
3529
sampled:sampled
@@ -41,9 +35,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
4135
releaseName:(nullable NSString *)releaseName
4236
environment:(nullable NSString *)environment
4337
transaction:(nullable NSString *)transaction
44-
#if !SDK_V9
45-
userSegment:(nullable NSString *)userSegment
46-
#endif
4738
sampleRate:(nullable NSString *)sampleRate
4839
sampleRand:(nullable NSString *)sampleRand
4940
sampled:(nullable NSString *)sampled
@@ -56,9 +47,6 @@ - (instancetype)initWithTraceId:(SentryId *)traceId
5647
_releaseName = releaseName;
5748
_environment = environment;
5849
_transaction = transaction;
59-
#if !SDK_V9
60-
_userSegment = userSegment;
61-
#endif
6250
_sampleRate = sampleRate;
6351
_sampleRand = sampleRand;
6452
_sampled = sampled;
@@ -88,12 +76,6 @@ - (NSString *)toHTTPHeaderWithOriginalBaggage:(NSDictionary *_Nullable)originalB
8876
[information setValue:_transaction forKey:@"sentry-transaction"];
8977
}
9078

91-
#if !SDK_V9
92-
if (_userSegment != nil) {
93-
[information setValue:_userSegment forKey:@"sentry-user_segment"];
94-
}
95-
#endif
96-
9779
if (_sampleRand != nil) {
9880
[information setValue:_sampleRand forKey:@"sentry-sample_rand"];
9981
}

‎Sources/Sentry/SentryBreadcrumb.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ - (BOOL)isEqual:(id _Nullable)other
7777
{
7878
if (other == self)
7979
return YES;
80-
if (!other || ![[other class] isEqual:[self class]])
80+
if (!other || ![other isKindOfClass:[self class]])
8181
return NO;
8282

8383
return [self isEqualToBreadcrumb:SENTRY_UNWRAP_NULLABLE(SentryBreadcrumb, other)];

‎Sources/Sentry/SentryClient.m‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -421,18 +421,8 @@ - (nullable SentryTraceContext *)getTraceStateWithEvent:(SentryEvent *)event
421421
}
422422

423423
if (event.error || event.exceptions.count > 0) {
424-
#if !SDK_V9
425-
NSString *segment = nil;
426-
# pragma clang diagnostic push
427-
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
428-
segment = scope.userObject.segment;
429-
# pragma clang diagnostic pop
430-
#endif
431424
return [[SentryTraceContext alloc] initWithTraceId:scope.propagationContext.traceId
432425
options:self.options
433-
#if !SDK_V9
434-
userSegment:segment
435-
#endif
436426
replayId:scope.replayId];
437427
}
438428

‎Sources/Sentry/SentryGeo.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ - (BOOL)isEqual:(id _Nullable)other
4343
if (other == self) {
4444
return YES;
4545
}
46-
if (!other || ![[other class] isEqual:[self class]]) {
46+
if (!other || ![other isKindOfClass:[self class]]) {
4747
return NO;
4848
}
4949

0 commit comments

Comments
 (0)