Skip to content

FirebaseApp: send Core Diagnostics data on appDidBecomeActive #3437

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

Merged
merged 6 commits into from
Jul 29, 2019
Merged

FirebaseApp: send Core Diagnostics data on appDidBecomeActive #3437

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c8bad9
FIRApp: send CoreDiagnostics data on appDidBecomeActive.
maksymmalyhin Jul 25, 2019
645d020
./scripts/style.sh
maksymmalyhin Jul 25, 2019
69befe3
Renaming.
maksymmalyhin Jul 26, 2019
0964277
FIRAppTest: stub FIRCoreDiagnosticsConnector to avoid invoking FIRCo…
maksymmalyhin Jul 26, 2019
991bab7
Run ./scripts/style.sh
maksymmalyhin Jul 26, 2019
037e835
Rename to `logCoreTelemetry`
maksymmalyhin Jul 26, 2019
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
10 changes: 9 additions & 1 deletion Example/Core/Tests/FIRAppTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ - (void)setUp {
_observerMock = OCMObserverMock();
_mockCoreDiagnosticsConnector = OCMClassMock([FIRCoreDiagnosticsConnector class]);

OCMStub(ClassMethod([self.mockCoreDiagnosticsConnector logCoreDataWithOptions:[OCMArg any]]))
.andDo(^(NSInvocation *invocation){
});

// TODO: Remove all usages of defaultCenter in Core, then we can instantiate an instance here to
// inject instead of using defaultCenter.
_notificationCenter = [NSNotificationCenter defaultCenter];
Expand Down Expand Up @@ -769,8 +773,12 @@ - (void)expectNotificationForObserver:(id)observer
}

- (void)expectCoreDiagnosticsDataLogWithOptions:(nullable FIROptions *)expectedOptions {
[self.mockCoreDiagnosticsConnector stopMocking];
self.mockCoreDiagnosticsConnector = nil;
self.mockCoreDiagnosticsConnector = OCMClassMock([FIRCoreDiagnosticsConnector class]);

OCMExpect(ClassMethod([self.mockCoreDiagnosticsConnector
logConfigureCoreWithOptions:[OCMArg checkWithBlock:^BOOL(FIROptions *options) {
logCoreDataWithOptions:[OCMArg checkWithBlock:^BOOL(FIROptions *options) {
if (!expectedOptions) {
return YES;
}
Expand Down
8 changes: 4 additions & 4 deletions Firebase/Core/FIRApp.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ - (BOOL)configureCore {
return NO;
}

[self logDiagnostics];
[self logDiagnosticsIfEnabled];

#if TARGET_OS_IOS
// Initialize the Analytics once there is a valid options under default app. Analytics should
Expand Down Expand Up @@ -824,12 +824,12 @@ - (void)subscribeForAppDidBecomeActiveNotifications {
}

- (void)appDidBecomeActive:(NSNotification *)notification {
[self logDiagnostics];
[self logDiagnosticsIfEnabled];
}

- (void)logDiagnostics {
- (void)logDiagnosticsIfEnabled {
if ([self isDataCollectionDefaultEnabled]) {
[FIRCoreDiagnosticsConnector logConfigureCoreWithOptions:_options];
[FIRCoreDiagnosticsConnector logCoreDataWithOptions:_options];
}
}

Expand Down
2 changes: 1 addition & 1 deletion Firebase/Core/FIRCoreDiagnosticsConnector.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ + (void)initialize {
}
}

+ (void)logConfigureCoreWithOptions:(FIROptions *)options {
+ (void)logCoreDataWithOptions:(FIROptions *)options {
if (FIRCoreDiagnosticsImplementation) {
FIRDiagnosticsData *diagnosticsData = [[FIRDiagnosticsData alloc] init];
[diagnosticsData insertValue:@(YES) forKey:kFIRCDIsDataCollectionDefaultEnabledKey];
Expand Down
4 changes: 2 additions & 2 deletions Firebase/Core/Private/FIRCoreDiagnosticsConnector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ NS_ASSUME_NONNULL_BEGIN
/** Connects FIRCore with the CoreDiagnostics library. */
@interface FIRCoreDiagnosticsConnector : NSObject

/** Logs data related to a -configureCore call.
/** Logs FirebaseCore related data.
*
* @param options The options object containing data to log.
*/
+ (void)logConfigureCoreWithOptions:(FIROptions *)options;
+ (void)logCoreDataWithOptions:(FIROptions *)options;
Copy link
Contributor

@mikehaney24 mikehaney24 Jul 26, 2019

Choose a reason for hiding this comment

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

maybe logCoreTelemetry? CoreData has a pretty specific meaning in iOS.

Copy link
Contributor Author

@maksymmalyhin maksymmalyhin Jul 26, 2019

Choose a reason for hiding this comment

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

yeah, logCoreTelemetry sounds better, thanks


@end

Expand Down