ref: Remove SentrySDK from trace propagation class

Author: philipphofmann

Sources/Sentry/SentryNetworkTracker.m

@@ -191,6 +191,7 @@ - (void)urlSessionTaskResume:(NSURLSessionTask *)sessionTask
         SentryBaggage *baggage = [[[SentryTracer getTracer:span] traceContext] toBaggage];
         [SentryTracePropagation addBaggageHeader:baggage
                                      traceHeader:[netSpan toTraceHeader]
+                         tracePropagationTargets:SentrySDKInternal.options.tracePropagationTargets
                                        toRequest:sessionTask];
 
         SENTRY_LOG_DEBUG(
@@ -225,6 +226,7 @@ - (void)addTraceWithoutTransactionToTask:(NSURLSessionTask *)sessionTask
 
     [SentryTracePropagation addBaggageHeader:[traceContext toBaggage]
                                  traceHeader:[propagationContext traceHeader]
+                     tracePropagationTargets:SentrySDKInternal.options.tracePropagationTargets
                                    toRequest:sessionTask];
 }
 

Sources/Sentry/SentryTracePropagation.m

@@ -1,17 +1,18 @@
 #import <SentryBaggage.h>
 #import <SentryLogC.h>
-#import <SentrySDK+Private.h>
 #import <SentrySwift.h>
 #import <SentryTraceHeader.h>
 #import <SentryTracePropagation.h>
 
 @implementation SentryTracePropagation
 
 + (void)addBaggageHeader:(SentryBaggage *)baggage
-             traceHeader:(SentryTraceHeader *)traceHeader
-               toRequest:(NSURLSessionTask *)sessionTask
+                traceHeader:(SentryTraceHeader *)traceHeader
+    tracePropagationTargets:(NSArray *)tracePropagationTargets
+                  toRequest:(NSURLSessionTask *)sessionTask
 {
-    if (![SentryTracePropagation sessionTaskRequiresPropagation:sessionTask]) {
+    if (![SentryTracePropagation sessionTaskRequiresPropagation:sessionTask
+                                        tracePropagationTargets:tracePropagationTargets]) {
         SENTRY_LOG_DEBUG(@"Not adding trace_id and baggage headers for %@",
             sessionTask.currentRequest.URL.absoluteString);
         return;
@@ -65,10 +66,11 @@ + (void)addBaggageHeader:(SentryBaggage *)baggage
 }
 
 + (BOOL)sessionTaskRequiresPropagation:(NSURLSessionTask *)sessionTask
+               tracePropagationTargets:(NSArray *)tracePropagationTargets
 {
     return sessionTask.currentRequest != nil &&
         [SentryTracePropagation isTargetMatch:sessionTask.currentRequest.URL
-                                  withTargets:SentrySDKInternal.options.tracePropagationTargets];
+                                  withTargets:tracePropagationTargets];
 }
 
 + (BOOL)isTargetMatch:(NSURL *)URL withTargets:(NSArray *)targets

Sources/Sentry/include/SentryTracePropagation.h

@@ -8,8 +8,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SentryTracePropagation : NSObject
 
 + (void)addBaggageHeader:(SentryBaggage *)baggage
-             traceHeader:(SentryTraceHeader *)traceHeader
-               toRequest:(NSURLSessionTask *)sessionTask;
+                traceHeader:(SentryTraceHeader *)traceHeader
+    tracePropagationTargets:(NSArray *)tracePropagationTargets
+                  toRequest:(NSURLSessionTask *)sessionTask;
 
 + (BOOL)isTargetMatch:(NSURL *)URL withTargets:(NSArray *)targets;