Implement Firebase CoreDiagnostics

CMakeLists.txt

@@ -230,8 +230,35 @@ podspec_framework(
   SPECS Logger
 )
 
+podspec_framework(${FIREBASE_SOURCE_DIR}/GoogleDataTransport.podspec)
+
+podspec_framework(${FIREBASE_SOURCE_DIR}/GoogleDataTransportCCTSupport.podspec)
+
 podspec_framework(${FIREBASE_SOURCE_DIR}/FirebaseCore.podspec)
 
+podspec_framework(${FIREBASE_SOURCE_DIR}/FirebaseCoreDiagnostics.podspec)
+
+podspec_framework(
+  ${FIREBASE_SOURCE_DIR}/FirebaseCoreDiagnosticsInterop.podspec
+)
+
+if(APPLE)
+  # FirebaseCoreDiagnosticsInterop has no source files but CMake can't build
+  # frameworks that don't have sources. Generate an inconsequential source
+  # file so that the library can be linked.
+  file(
+    WRITE ${CMAKE_CURRENT_BINARY_DIR}/FirebaseCoreDiagnosticsInteropDummy.c
+    "// generated file for header-only CMake support.
+    __attribute__((unused))
+    static void FirebaseCoreDiagnosticsInteropFakeSymbol() {}
+    "
+  )
+  target_sources(
+    FirebaseCoreDiagnosticsInterop
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/FirebaseCoreDiagnosticsInteropDummy.c
+  )
+endif()
+
 podspec_framework(${FIREBASE_SOURCE_DIR}/FirebaseAuthInterop.podspec)
 
 if(APPLE)

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile

@@ -5,8 +5,9 @@ target 'CocoapodsIntegrationTest' do
   use_frameworks!
 
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -15,5 +16,7 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile

@@ -3,8 +3,9 @@ platform :ios, '9.0'
 
 target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -13,5 +14,7 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile

@@ -5,8 +5,9 @@ target 'CocoapodsIntegrationTest' do
   use_frameworks!
 
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -15,5 +16,7 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile

@@ -6,8 +6,9 @@ target 'CocoapodsIntegrationTest' do
   use_frameworks!
 
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -16,6 +17,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end
 

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile

@@ -3,8 +3,9 @@ platform :ios, '9.0'
 
 target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -13,6 +14,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end
 

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile

@@ -3,8 +3,9 @@ platform :ios, '9.0'
 
 target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCore', :path => '../'
+  pod 'FirebaseCoreDiagnostics', :path => '../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseCore', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'
@@ -13,5 +14,7 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseInstanceID', :path => '../'
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
+  pod 'GoogleDataTransport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

Example/Auth/AuthSample/Podfile

@@ -9,9 +9,12 @@ use_frameworks!
 target 'AuthSample' do
   platform :ios, '8.0'
   pod 'FirebaseCore', :path => '../../../'
+  pod 'FirebaseCoreDiagnostics', :path => '../../../'
+  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../../'
+  pod 'GoogleDataTransport', :path => '../../../'
+  pod 'GoogleDataTransportCCTSupport', :path => '../../../'
   pod 'GoogleUtilities', :path => '../../../'
   pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit']
-  pod 'FirebaseCore', :path => '../../../'
   pod 'FirebaseInstanceID', :path => '../../..'
   pod 'FBSDKLoginKit'
   pod 'GoogleSignIn'

Example/Core/Tests/FIRAppTest.m

@@ -15,6 +15,9 @@
 #import "FIRTestCase.h"
 #import "FIRTestComponents.h"
 
+#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h>
+#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h>
+
 #import <FirebaseCore/FIRAnalyticsConfiguration.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIROptionsInternal.h>
@@ -262,7 +265,7 @@ - (void)testDeleteApp {
 - (void)testErrorForSubspecConfigurationFailure {
   NSError *error = [FIRApp errorForSubspecConfigurationFailureWithDomain:kFirebaseCoreErrorDomain
                                                                errorCode:-38
-                                                                 service:kFIRServiceAuth
+                                                                 service:@"Auth"
                                                                   reason:@"some reason"];
   XCTAssertNotNil(error);
   XCTAssert([error.domain isEqualToString:kFirebaseCoreErrorDomain]);
@@ -632,9 +635,6 @@ - (void)testGlobalDataCollectionNoDiagnosticsSent {
   // Ensure configure doesn't fire a notification.
   [FIRApp configure];
 
-  NSError *error = [NSError errorWithDomain:@"com.firebase" code:42 userInfo:nil];
-  [app sendLogsWithServiceName:@"Service" version:@"Version" error:error];
-
   // The observer mock is strict and will raise an exception when an unexpected notification is
   // received.
   OCMVerifyAll(self.observerMock);

Example/Core/Tests/FIRDiagnosticsDataTest.m

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import <FirebaseCore/FIRDiagnosticsData.h>
+
+@interface FIRDiagnosticsDataTest : XCTestCase
+
+@end
+
+@implementation FIRDiagnosticsDataTest
+
+/** Tests initialization. */
+- (void)testInit {
+  FIRDiagnosticsData *data = [[FIRDiagnosticsData alloc] init];
+  XCTAssertNotNil(data);
+}
+
+/** Tests that -diagnosticObjects returns a valid default dictionary. */
+- (void)testFIRCoreDiagnosticsData {
+  FIRDiagnosticsData *data = [[FIRDiagnosticsData alloc] init];
+  XCTAssertNotNil(data.diagnosticObjects);
+  XCTAssertNotNil(data.diagnosticObjects[kFIRCDIsDataCollectionDefaultEnabledKey]);
+  XCTAssertNotNil(data.diagnosticObjects[kFIRCDllAppsCountKey]);
+  XCTAssertNotNil(data.diagnosticObjects[kFIRCDFirebaseUserAgentKey]);
+}
+
+/** Tests that setting diagnosticObjects throws. */
+- (void)testSettingDiagnosticObjectsThrows {
+  FIRDiagnosticsData *data = [[FIRDiagnosticsData alloc] init];
+  XCTAssertThrows(data.diagnosticObjects = @{});
+}
+
+@end

Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsDateFileStorageTests.m

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <XCTest/XCTest.h>
+#import "FIRCDLibrary/FIRCoreDiagnosticsDateFileStorage.h"
+
+@interface FIRCoreDiagnosticsDateFileStorageTests : XCTestCase
+@property(nonatomic) NSURL *fileURL;
+@property(nonatomic) FIRCoreDiagnosticsDateFileStorage *storage;
+@end
+
+@implementation FIRCoreDiagnosticsDateFileStorageTests
+
+- (void)setUp {
+  NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(
+      NSApplicationSupportDirectory, NSUserDomainMask, YES) firstObject];
+  XCTAssertNotNil(documentsPath);
+  NSURL *documentsURL = [NSURL fileURLWithPath:documentsPath];
+  self.fileURL = [documentsURL URLByAppendingPathComponent:@"FIRDiagnosticsDateFileStorageTests"
+                                               isDirectory:NO];
+
+  NSError *error;
+  if (![documentsURL checkResourceIsReachableAndReturnError:&error]) {
+    XCTAssert([[NSFileManager defaultManager] createDirectoryAtURL:documentsURL
+                                       withIntermediateDirectories:YES
+                                                        attributes:nil
+                                                             error:&error],
+              @"Error: %@", error);
+  }
+
+  self.storage = [[FIRCoreDiagnosticsDateFileStorage alloc] initWithFileURL:self.fileURL];
+}
+
+- (void)tearDown {
+  [[NSFileManager defaultManager] removeItemAtURL:self.fileURL error:nil];
+  self.fileURL = nil;
+  self.storage = nil;
+}
+
+- (void)testDateStorage {
+  NSDate *dateToSave = [NSDate date];
+
+  XCTAssertNil([self.storage date]);
+
+  NSError *error;
+  XCTAssertTrue([self.storage setDate:dateToSave error:&error]);
+
+  XCTAssertEqualObjects([self.storage date], dateToSave);
+
+  XCTAssertTrue([self.storage setDate:nil error:&error]);
+  XCTAssertNil([self.storage date]);
+}
+
+- (void)testDateIsStoredToFileSystem {
+  NSDate *date = [NSDate date];
+
+  NSError *error;
+  XCTAssert([self.storage setDate:date error:&error], @"Error: %@", error);
+
+  FIRCoreDiagnosticsDateFileStorage *anotherStorage =
+      [[FIRCoreDiagnosticsDateFileStorage alloc] initWithFileURL:self.fileURL];
+
+  XCTAssertEqualObjects([anotherStorage date], date);
+}
+
+@end