Merge 8a4f0d0 into 56c9730

Author: brustolin

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 This version introduces a dependency on Swift, which only impacts you if you don't use Swift. If your project uses Swift already, this change will not affect you.
 
+### Breaking Changes
+
+- Mark [SpanProtocol setExtraValue:forKey] as deprecated (#2413)
+
 ### Features
 
 - Properly demangle Swift class name (#2162)

Sources/Sentry/Public/SentrySpanProtocol.h

@@ -70,7 +70,8 @@ NS_SWIFT_NAME(Span)
  * Use setDataValue instead. This method calls setDataValue, was added by mistake, and will be
  * deprecated in a future version.
  */
-- (void)setExtraValue:(nullable id)value forKey:(NSString *)key NS_SWIFT_NAME(setExtra(value:key:));
+- (void)setExtraValue:(nullable id)value
+               forKey:(NSString *)key DEPRECATED_ATTRIBUTE NS_SWIFT_NAME(setExtra(value:key:));
 
 /**
  * Removes a data value.

Sources/Sentry/SentryNoOpSpan.h

@@ -17,6 +17,7 @@ SENTRY_NO_INIT
 @property (nullable, readonly) NSDictionary<NSString *, id> *data;
 @property (readonly) NSDictionary<NSString *, NSString *> *tags;
 
+- (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE;
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentrySpan.h

@@ -45,6 +45,7 @@ SENTRY_NO_INIT
  */
 - (instancetype)initWithTracer:(SentryTracer *)transaction context:(SentrySpanContext *)context;
 
+- (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE;
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryTracer.h

@@ -143,6 +143,8 @@ static NSTimeInterval const SentryTracerDefaultTimeout = 3.0;
  */
 - (void)spanFinished:(id<SentrySpan>)finishedSpan;
 
+- (void)setExtraValue:(nullable id)value forKey:(NSString *)key DEPRECATED_ATTRIBUTE;
+
 /**
  * Get the tracer from a span.
  */

Tests/SentryTests/Performance/SentryTracerTests.swift

@@ -810,13 +810,6 @@ class SentryTracerTests: XCTestCase {
     }
 #endif
 
-    func testSetExtra_ForwardsToSetData() {
-        let sut = fixture.getSut()
-        sut.setExtra(value: 0, key: "key")
-        
-        XCTAssertEqual(["key": 0], sut.data as! [String: Int])
-    }
-    
     func testTagsFromContext_shouldBeSerialized() {
         // given
         fixture.transactionContext.setTag(value: fixture.testValue, key: fixture.testKey)

Tests/SentryTests/Transaction/SentryNoOpSpanTests.swift

@@ -27,7 +27,6 @@ class SentryNoOpSpanTests: XCTestCase {
         let sut = SentryNoOpSpan.shared()
         XCTAssertNil(sut.data)
         sut.setData(value: "tet", key: "key")
-        sut.setExtra(value: "tet", key: "key")
         sut.removeData(key: "any")
         XCTAssertNil(sut.data)
     }

Tests/SentryTests/Transaction/SentrySpanTests.swift

@@ -185,10 +185,10 @@ class SentrySpanTests: XCTestCase {
         XCTAssertFalse(logOutput.loggedMessages.filter({ $0.contains(" Starting a child on a finished span is not supported; it won\'t be sent to Sentry.") }).isEmpty)
     }
 
-    func testAddAndRemoveExtras() {
+    func testAddAndRemoveData() {
         let span = fixture.getSut()
 
-        span.setExtra(value: fixture.extraValue, key: fixture.extraKey)
+        span.setData(value: fixture.extraValue, key: fixture.extraKey)
 
         XCTAssertEqual(span.data!.count, 1)
         XCTAssertEqual(span.data![fixture.extraKey] as! String, fixture.extraValue)
@@ -214,7 +214,7 @@ class SentrySpanTests: XCTestCase {
     func testSerialization() {
         let span = fixture.getSut()
 
-        span.setExtra(value: fixture.extraValue, key: fixture.extraKey)
+        span.setData(value: fixture.extraValue, key: fixture.extraKey)
         span.setTag(value: fixture.extraValue, key: fixture.extraKey)
         span.finish()
 
@@ -234,7 +234,7 @@ class SentrySpanTests: XCTestCase {
     func testSanitizeData() {
         let span = fixture.getSut()
 
-        span.setExtra(value: Date(timeIntervalSince1970: 10), key: "date")
+        span.setData(value: Date(timeIntervalSince1970: 10), key: "date")
         span.finish()
 
         let serialization = span.serialize()
@@ -244,7 +244,7 @@ class SentrySpanTests: XCTestCase {
     func testSanitizeDataSpan() {
         let span = SentrySpan(tracer: fixture.tracer, context: SpanContext(operation: fixture.someOperation, sampled: .undecided))
 
-        span.setExtra(value: Date(timeIntervalSince1970: 10), key: "date")
+        span.setData(value: Date(timeIntervalSince1970: 10), key: "date")
         span.finish()
 
         let serialization = span.serialize()
@@ -304,14 +304,7 @@ class SentrySpanTests: XCTestCase {
         XCTAssertEqual(header.sampled, .undecided)
         XCTAssertEqual(header.value(), "\(span.context.traceId)-\(span.context.spanId)")
     }
-    
-    func testSetExtra_ForwardsToSetData() {
-        let sut = SentrySpan(tracer: fixture.tracer, context: SpanContext(operation: "test"))
-        sut.setExtra(value: 0, key: "key")
-        
-        XCTAssertEqual(["key": 0], sut.data as! [String: Int])
-    }
-    
+     
     func testSpanWithoutTracer_StartChild_ReturnsNoOpSpan() {
         // Span has a weak reference to tracer. If we don't keep a reference
         // to the tracer ARC will deallocate the tracer.
@@ -349,7 +342,7 @@ class SentrySpanTests: XCTestCase {
             queue.async {
 
                 for j in 0..<innerLoop {
-                    span.setExtra(value: value, key: "\(i)-\(j)")
+                    span.setData(value: value, key: "\(i)-\(j)")
                     span.setTag(value: value, key: "\(i)-\(j)")
                 }
 

Tests/SentryTests/Transaction/TestSentrySpan.h

@@ -4,6 +4,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TestSentrySpan : NSObject <SentrySpan>
 
+- (void)setExtraValue:(nullable id)value forKey:(nonnull NSString *)key DEPRECATED_ATTRIBUTE;
+
 @end
 
 NS_ASSUME_NONNULL_END