diff --git a/CHANGELOG-v9.md b/CHANGELOG-v9.md index 1de66a4bc5c..3967c85b459 100644 --- a/CHANGELOG-v9.md +++ b/CHANGELOG-v9.md @@ -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) diff --git a/Sources/Sentry/Public/SentryDefines.h b/Sources/Sentry/Public/SentryDefines.h index e04befbca9d..b037e44c6f7 100644 --- a/Sources/Sentry/Public/SentryDefines.h +++ b/Sources/Sentry/Public/SentryDefines.h @@ -152,6 +152,7 @@ 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. @@ -159,7 +160,6 @@ typedef NSNumber *_Nullable (^SentryTracesSamplerCallback)( typedef void (^SentrySpanCallback)(id _Nullable span DEPRECATED_MSG_ATTRIBUTE( "See `SentryScope.useSpan` for reasoning of deprecation.")); -#if !SDK_V9 /** * Log level. */ diff --git a/Sources/Sentry/Public/SentrySpanProtocol.h b/Sources/Sentry/Public/SentrySpanProtocol.h index 84605537c0e..dec9d7089e6 100644 --- a/Sources/Sentry/Public/SentrySpanProtocol.h +++ b/Sources/Sentry/Public/SentrySpanProtocol.h @@ -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. diff --git a/Sources/Sentry/SentryScope.m b/Sources/Sentry/SentryScope.m index 97ce5a58e6f..9420e7badbb 100644 --- a/Sources/Sentry/SentryScope.m +++ b/Sources/Sentry/SentryScope.m @@ -155,11 +155,13 @@ - (void)setPropagationContext:(SentryPropagationContext *)propagationContext } } +#if !SDK_V9 - (void)useSpan:(SentrySpanCallback)callback { id localSpan = [self span]; callback(localSpan); } +#endif // !SDK_V9 - (void)clear { diff --git a/Sources/Sentry/SentrySpan.m b/Sources/Sentry/SentrySpan.m index 6950d419be0..4d354fce3d4 100644 --- a/Sources/Sentry/SentrySpan.m +++ b/Sources/Sentry/SentrySpan.m @@ -201,10 +201,12 @@ - (void)setDataValue:(nullable id)value forKey:(NSString *)key } } +#if !SDK_V9 - (void)setExtraValue:(nullable id)value forKey:(NSString *)key { [self setDataValue:value forKey:key]; } +#endif // !SDK_V9 - (void)removeDataForKey:(NSString *)key { diff --git a/Sources/Sentry/include/SentryNoOpSpan.h b/Sources/Sentry/include/SentryNoOpSpan.h index 61ae0d0795a..005f2bf2263 100644 --- a/Sources/Sentry/include/SentryNoOpSpan.h +++ b/Sources/Sentry/include/SentryNoOpSpan.h @@ -15,7 +15,9 @@ SENTRY_NO_INIT @property (nullable, readonly) NSDictionary *data; @property (readonly) NSDictionary *tags; +#if !SDK_V9 - (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE; +#endif // !SDK_V9 @end NS_ASSUME_NONNULL_END diff --git a/Sources/Sentry/include/SentrySpan.h b/Sources/Sentry/include/SentrySpan.h index 7fd111eed5b..514c27016f9 100644 --- a/Sources/Sentry/include/SentrySpan.h +++ b/Sources/Sentry/include/SentrySpan.h @@ -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 diff --git a/sdk_api_V9.json b/sdk_api_V9.json index 7fd0ad5131f..f5fd947072d 100644 --- a/sdk_api_V9.json +++ b/sdk_api_V9.json @@ -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", @@ -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": "", - "deprecated": true, - "protocolReq": true, - "objc_name": "setExtraValue:forKey:", - "declAttributes": [ - "Available", - "ObjC", - "Dynamic" - ], - "reqNewWitnessTableEntry": true, - "funcSelfKind": "NonMutating" - }, { "kind": "Function", "name": "removeData",