[RUM-16386] Add RemoteConfigurationProvider, typed errors, and computed var remoteConfiguration #2980
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,7 +66,7 @@ internal final class DataUploader: DataUploaderType { | |
|
|
||
| httpClient.send(request: request, delegate: delegate) { result in | ||
| switch result { | ||
| case .success(let (httpResponse, _)): | ||
| uploadStatus = DataUploadStatus( | ||
| httpResponse: httpResponse, | ||
| ddRequestID: requestID, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,27 +12,20 @@ internal protocol HTTPClient { | |
| /// - Parameters: | ||
| /// - request: The request to be sent. | ||
| /// - delegate: The task-specific delegate. | ||
| /// - completion: A closure that receives a Result containing either the HTTP response and body or an Error. | ||
| func send( | ||
| request: URLRequest, | ||
| delegate: URLSessionTaskDelegate?, | ||
| completion: @escaping (Result<(HTTPURLResponse, Data?), Error>) -> Void | ||
| ) | ||
| } | ||
|
|
||
| extension HTTPClient { | ||
| /// Sends the provided request using HTTP. | ||
| /// - Parameters: | ||
| /// - request: The request to be sent. | ||
| /// - completion: A closure that receives a Result containing either the HTTP response and body or an Error. | ||
| func send(request: URLRequest, completion: @escaping (Result<(HTTPURLResponse, Data?), Error>) -> Void) { | ||
| self.send(request: request, delegate: nil, completion: completion) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,22 +35,11 @@ internal class URLSessionClient: HTTPClient { | |
| self.session = session | ||
| } | ||
|
|
||
| func send( | ||
| request: URLRequest, | ||
| delegate: URLSessionTaskDelegate?, | ||
| completion: @escaping (Result<(HTTPURLResponse, Data?), Error>) -> Void | ||
| ) { | ||
| let task = session.dataTask(with: request) { data, response, error in | ||
| completion(httpClientResult(for: (data, response, error))) | ||
| } | ||
|
|
@@ -76,17 +65,16 @@ private func basicHTTPAuthentication(username: String, password: String) -> Stri | |
| return "Basic \(credential)" | ||
| } | ||
|
|
||
| /// Returns a typed HTTP result from `URLSession`'s completion values. | ||
| private func httpClientResult(for urlSessionTaskCompletion: (Data?, URLResponse?, Error?)) -> Result<(HTTPURLResponse, Data?), Error> { | ||
| let (data, response, error) = urlSessionTaskCompletion | ||
|
|
||
| if let error = error { | ||
| return .failure(error) | ||
| } | ||
|
|
||
| if let httpResponse = response as? HTTPURLResponse { | ||
| return .success((httpResponse, data)) | ||
| } | ||
|
|
||
| return .failure(URLSessionTransportInconsistencyException()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -423,12 +423,22 @@ extension DatadogCore { | |
| site: configuration.site | ||
| ) | ||
|
|
||
| let httpClient = configuration.httpClientFactory(configuration.proxyConfiguration) | ||
| let remoteConfigurationProvider = configuration.remoteConfigurationID.map { | ||
| RemoteConfigurationProvider( | ||
| id: $0, | ||
| site: configuration.site, | ||
| directory: directory.coreDirectory, | ||
| httpClient: httpClient | ||
| ) | ||
| } | ||
|
|
||
| self.init( | ||
| directory: directory, | ||
| dateProvider: configuration.dateProvider, | ||
| initialConsent: trackingConsent, | ||
| performance: performance, | ||
| httpClient: httpClient, | ||
| encryption: configuration.encryption, | ||
| contextProvider: DatadogContextProvider( | ||
| site: configuration.site, | ||
|
|
@@ -462,12 +472,12 @@ extension DatadogCore { | |
| maxBatchesPerUpload: configuration.batchProcessingLevel.maxBatchesPerUpload, | ||
| backgroundTasksEnabled: configuration.backgroundTasksEnabled, | ||
| isRunFromExtension: isRunFromExtension, | ||
| remoteConfigurationProvider: remoteConfigurationProvider | ||
| ) | ||
|
|
||
| remoteConfigurationProvider?.sync { result in | ||
| if case .failure(let error) = result { | ||
| self.telemetry.error("[RemoteConfig] Sync failed", error: error) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With
remoteConfigurationIDset, this computed property reads the provider's live cache, whichsync()mutates after initialization. If the CDN request finishes before a feature is enabled (for example an app delaysRUM.enableor a test uses a local protocol), a first-ever launch can receive a freshly fetched configuration instead ofnil, despite the core protocol requiring the document cached at initialization time; this makes remote configuration application depend on network timing, so snapshot the initial cache separately from the async refresh.Useful? React with 👍 / 👎.