Avoid duplicating requests when not injecting tracing headers

Ignacio Bonafonte · Ignacio Bonafonte · commit d20a0c972819 · 2021-09-15T16:03:12.000+02:00
diff --git a/Sources/Instrumentation/URLSession/URLSessionLogger.swift b/Sources/Instrumentation/URLSession/URLSessionLogger.swift
@@ -79,7 +79,7 @@ class URLSessionLogger {
         }
 
         var returnRequest: URLRequest?
-        if shouldInjectHeaders {
+        if shouldInjectHeaders && (instrumentation.configuration.shouldInjectTracingHeaders?(request) ?? true) {
             returnRequest = instrumentedRequest(for: request, span: span, instrumentation: instrumentation)
         }
 
@@ -91,7 +91,7 @@ class URLSessionLogger {
 
         instrumentation.configuration.createdRequest?(returnRequest ?? request, span)
 
-        return returnRequest ?? request
+        return returnRequest
     }
 
     /// This methods ends a Span when a response arrives

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class URLSessionLogger {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`var returnRequest: URLRequest?`
`82`		`- if shouldInjectHeaders {`
	`82`	`+ if shouldInjectHeaders && (instrumentation.configuration.shouldInjectTracingHeaders?(request) ?? true) {`
`83`	`83`	`returnRequest = instrumentedRequest(for: request, span: span, instrumentation: instrumentation)`
`84`	`84`	`}`
`85`	`85`
`@@ -91,7 +91,7 @@ class URLSessionLogger {`
`91`	`91`
`92`	`92`	`instrumentation.configuration.createdRequest?(returnRequest ?? request, span)`
`93`	`93`
`94`		`- return returnRequest ?? request`
	`94`	`+ return returnRequest`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/// This methods ends a Span when a response arrives`