Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added other AV task exceptions in NSURLSession instrumentation #640

Merged
merged 5 commits into from
Nov 22, 2024
Merged

added other AV task exceptions in NSURLSession instrumentation #640

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34d83b5
added other AV task exceptions in NSURLSession instrumentation
bryce-b Nov 21, 2024
df96519
Merge branch 'main' into session-instrumentation-AV-fix
bryce-b Nov 21, 2024
b799e43
tidied syntax
bryce-b Nov 21, 2024
38e3837
Merge branch 'main' into session-instrumentation-AV-fix
bryce-b Nov 21, 2024
fd59ade
Merge branch 'main' into session-instrumentation-AV-fix
nachoBonafonte Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,25 @@ struct NetworkRequestState {
private var idKey: Void?

public class URLSessionInstrumentation {
private var requestMap = [String: NetworkRequestState]()

var configuration: URLSessionInstrumentationConfiguration

private let queue = DispatchQueue(label: "io.opentelemetry.ddnetworkinstrumentation")

static var instrumentedKey = "io.opentelemetry.instrumentedCall"

static let avAssetDownloadTask: AnyClass? = NSClassFromString("__NSCFBackgroundAVAssetDownloadTask")

private var requestMap = [String: NetworkRequestState]()

var configuration: URLSessionInstrumentationConfiguration

private let queue = DispatchQueue(label: "io.opentelemetry.ddnetworkinstrumentation")

static var instrumentedKey = "io.opentelemetry.instrumentedCall"

static let AVTaskClassList : [AnyClass] = {
let names = ["__NSCFBackgroundAVAggregateAssetDownloadTask", "__NSCFBackgroundAVAssetDownloadTask", "__NSCFBackgroundAVAggregateAssetDownloadTaskNoChildTask" ]
var classes : [AnyClass] = []
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

let classes = names.compactMap { NSClassFromString($0) }
return classes

for name in names {
if let aClass = NSClassFromString(name) {
classes.append(aClass)
}
}
return classes
}()

public private(set) var tracer: Tracer

public var startedRequestSpans: [Span] {
Expand Down Expand Up @@ -592,9 +601,10 @@ public class URLSessionInstrumentation {

private func urlSessionTaskWillResume(_ task: URLSessionTask) {
// AV Asset Tasks cannot be auto instrumented, they dont include request attributes, skip them
if let avAssetTaskClass = Self.avAssetDownloadTask,
task.isKind(of: avAssetTaskClass) {
return
for aClass in Self.AVTaskClassList {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contains(where:) would be more idiomatic.

guard !Self.AVTaskClassList.contains(where: { task.isKind(of: $0) }) else { return }

if task.isKind(of: aClass) {
return
}
}

// We cannot instrument async background tasks because they crash if you assign a delegate
Expand Down
Loading