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.

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

feat: Support Exporter Metadata #16

Merged
merged 4 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions Sources/GOFeatureFlag/controller/exporter_metadata.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import Foundation
import OpenFeature

// Define a Codable enum that can represent any type of JSON value
public enum ExporterMetadataValue: Codable, Equatable {
case string(String)
case integer(Int64)
case double(Double)
case bool(Bool)

// Decode the JSON based on its type
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()
if let stringValue = try? container.decode(String.self) {
self = .string(stringValue)
} else if let intValue = try? container.decode(Int64.self) {
self = .integer(intValue)
} else if let doubleValue = try? container.decode(Double.self) {
self = .double(doubleValue)
} else if let boolValue = try? container.decode(Bool.self) {
self = .bool(boolValue)
} else {
throw DecodingError.dataCorruptedError(in: container, debugDescription: "Cannot decode JSONValue")
}
}

// Encode the JSON based on its type
public func encode(to encoder: Encoder) throws {
var container = encoder.singleValueContainer()
switch self {
case .string(let value):
try container.encode(value)
case .integer(let value):
try container.encode(value)
case .double(let value):
try container.encode(value)
case .bool(let value):
try container.encode(value)
}
}
}
16 changes: 12 additions & 4 deletions Sources/GOFeatureFlag/controller/goff_api.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,20 @@

class GoFeatureFlagAPI {
private let networkingService: NetworkingService
private let options: GoFeatureFlagProviderOptions
private let metadata: [String:String] = ["provider": "openfeature-swift"]
private var options: GoFeatureFlagProviderOptions

init(networkingService: NetworkingService, options: GoFeatureFlagProviderOptions) {
self.networkingService = networkingService
self.options = options

Check warning on line 12 in Sources/GOFeatureFlag/controller/goff_api.swift

View workflow job for this annotation

GitHub Actions / Swift Lint

Trailing Whitespace Violation: Lines should not have trailing whitespace (trailing_whitespace)
if self.options.exporterMetadata == nil {
self.options.exporterMetadata = [:]
}
if var exporterMetadata = self.options.exporterMetadata {
exporterMetadata["openfeature"] = .bool(true)
exporterMetadata["provider"] = .string("swift")
self.options.exporterMetadata = exporterMetadata
}
}

func postDataCollector(events: [FeatureEvent]?) async throws -> (DataCollectorResponse, HTTPURLResponse) {
Expand All @@ -27,8 +35,8 @@
let dataCollectorURL = url.appendingPathComponent("v1/data/collector")
var request = URLRequest(url: dataCollectorURL)
request.httpMethod = "POST"

let requestBody = DataCollectorRequest(meta: metadata, events: events)

Check warning on line 38 in Sources/GOFeatureFlag/controller/goff_api.swift

View workflow job for this annotation

GitHub Actions / Swift Lint

Trailing Whitespace Violation: Lines should not have trailing whitespace (trailing_whitespace)
let requestBody = DataCollectorRequest(meta: self.options.exporterMetadata, events: events)
let encoder = JSONEncoder()
encoder.outputFormatting = .prettyPrinted
request.httpBody = try encoder.encode(requestBody)
Expand Down
4 changes: 2 additions & 2 deletions Sources/GOFeatureFlag/model/data_collector_request.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Foundation

struct DataCollectorRequest: Codable {
var meta: [String:String]?
var meta: [String:ExporterMetadataValue]?
var events: [FeatureEvent]? = []

public init(meta: [String:String]? = [:], events: [FeatureEvent]? = []) {
public init(meta: [String:ExporterMetadataValue]? = [:], events: [FeatureEvent]? = []) {
self.meta = meta
self.events = events
}
Expand Down
7 changes: 7 additions & 0 deletions Sources/GOFeatureFlag/options.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,24 @@ public struct GoFeatureFlagProviderOptions {
* default: URLSession.shared
*/
public var networkService: NetworkingService?
/**
* (optional) exporter metadata to be sent to the relay proxy data collector to be used for evaluation data events.
* default: empty
*/
public var exporterMetadata: [String:ExporterMetadataValue]? = [:]

public init(
endpoint: String,
pollInterval: TimeInterval = 60,
apiKey: String? = nil,
dataFlushInterval: TimeInterval = 600,
exporterMetadata: [String:ExporterMetadataValue]? = [:],
networkService: NetworkingService? = URLSession.shared) {
self.endpoint = endpoint
self.pollInterval = pollInterval
self.apiKey = apiKey
self.networkService = networkService
self.dataCollectorInterval = dataFlushInterval
self.exporterMetadata = exporterMetadata
}
}
2 changes: 2 additions & 0 deletions Tests/GOFeatureFlagTests/mock_networking_service.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ public class MockNetworkingService: NetworkingService {
var callCounter = 0
var dataCollectorCallCounter = 0
var dataCollectorEventCounter = 0
var requests: [URLRequest] = []

public init(mockStatus: Int = 200) {
self.mockStatus = mockStatus
}

public func doRequest(for request: URLRequest) async throws -> (Data, URLResponse) {
self.requests.append(request)
self.callCounter+=1
let isDataCollector = request.url?.absoluteString.contains("/v1/data/collector") ?? false
let isBulkEvaluation = request.url?.absoluteString.contains("/ofrep/v1/evaluate/flags") ?? false
Expand Down
93 changes: 91 additions & 2 deletions Tests/GOFeatureFlagTests/provider_tests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,101 @@ class GoFeatureFlagProviderTests: XCTestCase {

let expectation = self.expectation(description: "Waiting for delay")

DispatchQueue.global().asyncAfter(deadline: .now() + 1.0) { expectation.fulfill() }
await fulfillment(of: [expectation], timeout: 2.0)
DispatchQueue.global().asyncAfter(deadline: .now() + 2.0) { expectation.fulfill() }
await fulfillment(of: [expectation], timeout: 3.0)

XCTAssertEqual(1, mockNetworkService.dataCollectorCallCounter)
XCTAssertEqual(6, mockNetworkService.dataCollectorEventCounter)
}

func testExporterMetadata() async {
let mockNetworkService = MockNetworkingService(mockStatus: 200)
let provider = GoFeatureFlagProvider(
options: GoFeatureFlagProviderOptions(
endpoint: "https://localhost:1031",
dataFlushInterval: 1,
exporterMetadata: ["version": ExporterMetadataValue.string("1.0.0"),"testInt": ExporterMetadataValue.integer(123), "testDouble": ExporterMetadataValue.double(123.45)],
networkService: mockNetworkService
)
)
let evaluationCtx = MutableContext(targetingKey: "ede04e44-463d-40d1-8fc0-b1d6855578d0")
let api = OpenFeatureAPI()
await api.setProviderAndWait(provider: provider, initialContext: evaluationCtx)
let client = api.getClient()

_ = client.getBooleanDetails(key: "my-flag", defaultValue: false)
_ = client.getBooleanDetails(key: "my-flag", defaultValue: false)
_ = client.getIntegerDetails(key: "int-flag", defaultValue: 1)
_ = client.getDoubleDetails(key: "double-flag", defaultValue: 1.0)
_ = client.getStringDetails(key: "string-flag", defaultValue: "default")
_ = client.getObjectDetails(key: "object-flag", defaultValue: Value.null)

let expectation = self.expectation(description: "Waiting for delay")

DispatchQueue.global().asyncAfter(deadline: .now() + 2.0) { expectation.fulfill() }
await fulfillment(of: [expectation], timeout: 3.0)

XCTAssertEqual(1, mockNetworkService.dataCollectorCallCounter)
XCTAssertEqual(6, mockNetworkService.dataCollectorEventCounter)

do {
let httpBodyCollector = mockNetworkService.requests[mockNetworkService.requests.count - 1].httpBody!
let decodedStruct = try JSONDecoder().decode(DataCollectorRequest.self, from: httpBodyCollector)
let want = [
"version": ExporterMetadataValue.string("1.0.0"),
"testDouble": ExporterMetadataValue.double(123.45),
"testInt": ExporterMetadataValue.integer(123),
"openfeature": ExporterMetadataValue.bool(true),
"provider": ExporterMetadataValue.string("swift")
] as? [String: ExporterMetadataValue]
XCTAssertEqual(want, decodedStruct.meta)
} catch {
XCTFail("Error deserializing: \(error)")
}
}

func testExporterMetadataNil() async {
let mockNetworkService = MockNetworkingService(mockStatus: 200)
let provider = GoFeatureFlagProvider(
options: GoFeatureFlagProviderOptions(
endpoint: "https://localhost:1031",
dataFlushInterval: 1,
exporterMetadata: nil,
networkService: mockNetworkService
)
)
let evaluationCtx = MutableContext(targetingKey: "ede04e44-463d-40d1-8fc0-b1d6855578d0")
let api = OpenFeatureAPI()
await api.setProviderAndWait(provider: provider, initialContext: evaluationCtx)
let client = api.getClient()

_ = client.getBooleanDetails(key: "my-flag", defaultValue: false)
_ = client.getBooleanDetails(key: "my-flag", defaultValue: false)
_ = client.getIntegerDetails(key: "int-flag", defaultValue: 1)
_ = client.getDoubleDetails(key: "double-flag", defaultValue: 1.0)
_ = client.getStringDetails(key: "string-flag", defaultValue: "default")
_ = client.getObjectDetails(key: "object-flag", defaultValue: Value.null)

let expectation = self.expectation(description: "Waiting for delay")

DispatchQueue.global().asyncAfter(deadline: .now() + 2.0) { expectation.fulfill() }
await fulfillment(of: [expectation], timeout: 3.0)

XCTAssertEqual(1, mockNetworkService.dataCollectorCallCounter)
XCTAssertEqual(6, mockNetworkService.dataCollectorEventCounter)

do {
let httpBodyCollector = mockNetworkService.requests[mockNetworkService.requests.count - 1].httpBody!
let decodedStruct = try JSONDecoder().decode(DataCollectorRequest.self, from: httpBodyCollector)
let want = [
"openfeature": ExporterMetadataValue.bool(true),
"provider": ExporterMetadataValue.string("swift")
] as? [String: ExporterMetadataValue]
XCTAssertEqual(want, decodedStruct.meta)
} catch {
XCTFail("Error deserializing: \(error)")
}
}

func testProviderMultipleHookCall() async {
let mockNetworkService = MockNetworkingService(mockStatus: 200)
Expand Down
Loading