Remove some user feedback related v9 check (#6483)

Author: noahsmartin

CHANGELOG-v9.md

@@ -6,7 +6,6 @@ Removes deprecated SentryDebugImageProvider class (#5598)
 Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
 Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
 Removes public SentrySerializable conformance from many public models (#5636, #5840, #5982)
-Removes deprecated `setExtraValue` from SentrySpan (#5864)
 Removes `integrations` property from `SentryOptions` (#5749)
 Makes `SentryEventDecodable` internal (#5808)
 The `span` property on `SentryScope` is now readonly (#5866)

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Makes `PreviewRedactOptions`, `SentryProfileOptions`, `SentryRedactViewHelper`, `SentryViewScreenshotOptions`, `SentryReplayOptions`, `SentryUserFeedbackConfiguration`, `SentryUserFeedbackFormConfiguration`, `SentryUserFeedbackThemeConfiguration`, `SentryUserFeedbackWidgetConfiguration`, `SentryFeedback`, and `SentryExperimentalOptions` `final` (#6365)
 - Removes Decodable conformances from the public API of model classes (#5691)
 - Removes unused SentryLogLevel (#5591)
+- Removes deprecated `setExtraValue` from SentrySpan (#5864)
 - Removes deprecated getStoreEndpoint (#5591)
 - Removes deprecated useSpan function (#5591)
 - Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)

Sources/Sentry/Public/SentrySpanProtocol.h

@@ -124,15 +124,6 @@ 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.
  */

Sources/Sentry/SentryDataCategoryMapper.m

@@ -11,9 +11,6 @@
 NSString *const kSentryDataCategoryNameSession = @"session";
 NSString *const kSentryDataCategoryNameTransaction = @"transaction";
 NSString *const kSentryDataCategoryNameAttachment = @"attachment";
-#if !SDK_V9
-NSString *const kSentryDataCategoryNameUserFeedback = @"user_report";
-#endif // !SDK_V9
 NSString *const kSentryDataCategoryNameProfile = @"profile";
 NSString *const kSentryDataCategoryNameProfileChunk = @"profile_chunk_ui";
 NSString *const kSentryDataCategoryNameReplay = @"replay";
@@ -95,11 +92,6 @@
     if ([value isEqualToString:kSentryDataCategoryNameAttachment]) {
         return kSentryDataCategoryAttachment;
     }
-#if !SDK_V9
-    if ([value isEqualToString:kSentryDataCategoryNameUserFeedback]) {
-        return kSentryDataCategoryUserFeedback;
-    }
-#endif // !SDK_V9
     if ([value isEqualToString:kSentryDataCategoryNameProfile]) {
         return kSentryDataCategoryProfile;
     }
@@ -142,10 +134,6 @@
         return kSentryDataCategoryNameTransaction;
     case kSentryDataCategoryAttachment:
         return kSentryDataCategoryNameAttachment;
-#if !SDK_V9
-    case kSentryDataCategoryUserFeedback:
-        return kSentryDataCategoryNameUserFeedback;
-#endif // !SDK_V9
     case kSentryDataCategoryProfile:
         return kSentryDataCategoryNameProfile;
     case kSentryDataCategoryProfileChunk:

Sources/Sentry/SentryNoOpSpan.m

@@ -43,10 +43,6 @@ - (void)setDataValue:(nullable id)value forKey:(NSString *)key
 {
 }
 
-- (void)setExtraValue:(nullable id)value forKey:(NSString *)key
-{
-}
-
 - (void)removeDataForKey:(NSString *)key
 {
 }

Sources/Sentry/SentrySpan.m

@@ -195,13 +195,6 @@ - (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
 {
     @synchronized(_data) {

Sources/Sentry/include/SentryDataCategoryMapper.h

@@ -8,7 +8,6 @@ FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameError;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameSession;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameTransaction;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameAttachment;
-FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameUserFeedback;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameProfile;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameProfileChunk;
 FOUNDATION_EXPORT NSString *const kSentryDataCategoryNameReplay;

Sources/Sentry/include/SentryNoOpSpan.h

@@ -15,9 +15,6 @@ 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

Sources/Sentry/include/SentrySpan.h

@@ -111,9 +111,6 @@ 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

Sources/Swift/Helper/SentryEnvelopeItemType.swift

@@ -5,9 +5,6 @@
 @_spi(Private) @objcMembers public final class SentryEnvelopeItemTypes: NSObject {
     public static let event = "event"
     public static let session = "session"
-    #if !SDK_V9
-    public static let userFeedback = "user_report"
-    #endif
     public static let feedback = "feedback"
     public static let transaction = "transaction"
     public static let attachment = "attachment"