Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-v9.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#
Removes public SentrySerializable conformance from many public models (#5636)
Removes Decodable conformances from the public API of model classes (#5691)
Removes enableTracing property from SentryOptions (#5694)
Removes deprecated `setExtraValue` from SentrySpan (#5864)
Removes `integrations` property from `SentryOptions` (#5749)
Makes `SentryEventDecodable` internal (#5808)

Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/Public/SentryDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ typedef BOOL (^SentryShouldQueueEvent)(
typedef NSNumber *_Nullable (^SentryTracesSamplerCallback)(
SentrySamplingContext *_Nonnull samplingContext);

#if !SDK_V9
/**
* Function pointer for span manipulation.
* @param span The span to be used.
*/
typedef void (^SentrySpanCallback)(id<SentrySpan> _Nullable span DEPRECATED_MSG_ATTRIBUTE(
"See `SentryScope.useSpan` for reasoning of deprecation."));

#if !SDK_V9
/**
* Log level.
*/
Expand Down
2 changes: 2 additions & 0 deletions Sources/Sentry/Public/SentrySpanProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,14 @@ NS_SWIFT_NAME(Span)
*/
- (void)setDataValue:(nullable id)value forKey:(NSString *)key NS_SWIFT_NAME(setData(value:key:));

#if !SDK_V9
/**
* Use @c setDataValue instead. This method calls @c setDataValue, was added by mistake, and will be
* removed in a future version.
*/
- (void)setExtraValue:(nullable id)value
forKey:(NSString *)key DEPRECATED_ATTRIBUTE NS_SWIFT_NAME(setExtra(value:key:));
#endif // !SDK_V9

/**
* Removes a data value.
Expand Down
2 changes: 2 additions & 0 deletions Sources/Sentry/SentryScope.m
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,13 @@ - (void)setPropagationContext:(SentryPropagationContext *)propagationContext
}
}

#if !SDK_V9
- (void)useSpan:(SentrySpanCallback)callback
{
id<SentrySpan> localSpan = [self span];
callback(localSpan);
}
#endif // !SDK_V9

- (void)clear
{
Expand Down
2 changes: 2 additions & 0 deletions Sources/Sentry/SentrySpan.m
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
return [SentryNoOpSpan shared];
}

return [self.tracer startChildWithParentId:self.spanId

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -Dynamic, sentry-dynamic) / watchsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -Dynamic, sentry-dynamic) / watchos

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, staticlib, sentry-static) / watchsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (SentrySwiftUI, mh_dylib, sentry-swiftui) / watchos

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (SentrySwiftUI, mh_dylib, sentry-swiftui) / watchsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / watchsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, staticlib, sentry-static) / watchos

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / appletvsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / xros

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / appletvos

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / watchos

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]

Check warning on line 192 in Sources/Sentry/SentrySpan.m

View workflow job for this annotation

GitHub Actions / Build XCFramework Slices (Sentry, mh_dylib, -WithoutUIKitOrAppKit, WithoutUIKit, sentry-withoutui... / xrsimulator

implicit conversion from nullable pointer 'id<SentrySpan> _Nullable' to non-nullable pointer type 'id<SentrySpan> _Nonnull' [-Wnullable-to-nonnull-conversion]
operation:operation
description:description];
}
Expand All @@ -201,10 +201,12 @@
}
}

#if !SDK_V9
- (void)setExtraValue:(nullable id)value forKey:(NSString *)key
{
[self setDataValue:value forKey:key];
}
#endif // !SDK_V9

- (void)removeDataForKey:(NSString *)key
{
Expand Down
2 changes: 2 additions & 0 deletions Sources/Sentry/include/SentryNoOpSpan.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ SENTRY_NO_INIT
@property (nullable, readonly) NSDictionary<NSString *, id> *data;
@property (readonly) NSDictionary<NSString *, NSString *> *tags;

#if !SDK_V9
- (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE;
#endif // !SDK_V9
@end

NS_ASSUME_NONNULL_END
2 changes: 2 additions & 0 deletions Sources/Sentry/include/SentrySpan.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ SENTRY_NO_INIT
#endif // SENTRY_HAS_UIKIT
;

#if !SDK_V9
- (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE;
#endif // !SDK_V9
@end

NS_ASSUME_NONNULL_END
95 changes: 0 additions & 95 deletions sdk_api_V9.json
Original file line number Diff line number Diff line change
Expand Up @@ -31332,49 +31332,6 @@
"usr": "c:@T@SentryShouldQueueEvent",
"moduleName": "Sentry"
},
{
"kind": "TypeAlias",
"name": "SentrySpanCallback",
"printedName": "SentrySpanCallback",
"children": [
{
"kind": "TypeFunc",
"name": "Function",
"printedName": "((any Sentry.Span)?) -> Swift.Void",
"children": [
{
"kind": "TypeNameAlias",
"name": "Void",
"printedName": "Swift.Void",
"children": [
{
"kind": "TypeNominal",
"name": "Void",
"printedName": "()"
}
]
},
{
"kind": "TypeNominal",
"name": "Optional",
"printedName": "(any Sentry.Span)?",
"children": [
{
"kind": "TypeNominal",
"name": "Span",
"printedName": "any Sentry.Span",
"usr": "c:objc(pl)SentrySpan"
}
],
"usr": "s:Sq"
}
]
}
],
"declKind": "TypeAlias",
"usr": "c:@T@SentrySpanCallback",
"moduleName": "Sentry"
},
{
"kind": "TypeDecl",
"name": "SentrySpanStatus",
Expand Down Expand Up @@ -34236,58 +34193,6 @@
"reqNewWitnessTableEntry": true,
"funcSelfKind": "NonMutating"
},
{
"kind": "Function",
"name": "setExtra",
"printedName": "setExtra(value:key:)",
"children": [
{
"kind": "TypeNameAlias",
"name": "Void",
"printedName": "Swift.Void",
"children": [
{
"kind": "TypeNominal",
"name": "Void",
"printedName": "()"
}
]
},
{
"kind": "TypeNominal",
"name": "Optional",
"printedName": "Any?",
"children": [
{
"kind": "TypeNominal",
"name": "ProtocolComposition",
"printedName": "Any"
}
],
"usr": "s:Sq"
},
{
"kind": "TypeNominal",
"name": "String",
"printedName": "Swift.String",
"usr": "s:SS"
}
],
"declKind": "Func",
"usr": "c:objc(pl)SentrySpan(im)setExtraValue:forKey:",
"moduleName": "Sentry",
"genericSig": "<Self where Self : Sentry.Span>",
"deprecated": true,
"protocolReq": true,
"objc_name": "setExtraValue:forKey:",
"declAttributes": [
"Available",
"ObjC",
"Dynamic"
],
"reqNewWitnessTableEntry": true,
"funcSelfKind": "NonMutating"
},
{
"kind": "Function",
"name": "removeData",
Expand Down
Loading