Merge pull request #566 from DataDog/maxep/RUMM-1530-add-init-check

RUMM-1530 Add Datadog.isInitialized variable
DataDog · Aug 20, 2021 · 8b3a8ed · 8b3a8ed
2 parents 64e9ee8 + 94634cb
commit 8b3a8ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Sources/Datadog/Datadog.swift b/Sources/Datadog/Datadog.swift
@@ -102,6 +102,11 @@ public class Datadog {
         }
     }
 
+    /// Returns `true` if the Datadog SDK is already initialized, `false` otherwise.
+    public static var isInitialized: Bool {
+        return instance != nil
+    }
+
     /// Sets current user information.
     /// Those will be added to logs, traces and RUM events automatically.
     /// - Parameters:

diff --git a/Tests/DatadogTests/Datadog/DatadogTests.swift b/Tests/DatadogTests/Datadog/DatadogTests.swift
@@ -18,15 +18,15 @@ class DatadogTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        XCTAssertNil(Datadog.instance)
+        XCTAssertFalse(Datadog.isInitialized)
         printFunction = PrintFunctionMock()
         consolePrint = printFunction.print
     }
 
     override func tearDown() {
         consolePrint = { print($0) }
         printFunction = nil
-        XCTAssertNil(Datadog.instance)
+        XCTAssertFalse(Datadog.isInitialized)
         super.tearDown()
     }
 
@@ -38,7 +38,7 @@ class DatadogTests: XCTestCase {
             trackingConsent: .mockRandom(),
             configuration: defaultBuilder.build()
         )
-        XCTAssertNotNil(Datadog.instance)
+        XCTAssertTrue(Datadog.isInitialized)
         Datadog.flushAndDeinitialize()
     }
 
@@ -48,7 +48,7 @@ class DatadogTests: XCTestCase {
             trackingConsent: .mockRandom(),
             configuration: rumBuilder.build()
         )
-        XCTAssertNotNil(Datadog.instance)
+        XCTAssertTrue(Datadog.isInitialized)
         Datadog.flushAndDeinitialize()
     }
 
@@ -67,7 +67,7 @@ class DatadogTests: XCTestCase {
             printFunction.printedMessage,
             "🔥 Datadog SDK usage error: `clientToken` cannot be empty."
         )
-        XCTAssertNil(Datadog.instance)
+        XCTAssertFalse(Datadog.isInitialized)
     }
 
     func testGivenValidConfiguration_whenInitializedMoreThanOnce_itPrintsError() {