From afca2896b91a5b5d06623e11351a0255a32983ff Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Tue, 7 Nov 2023 15:57:49 -0500 Subject: [PATCH] [Core] Add `FIRGetLoggerLevel` function (#12065) --- FirebaseCore/Extension/FIRLogger.h | 5 +++++ FirebaseCore/Sources/FIRLogger.m | 4 ++++ FirebaseCore/Tests/Unit/FIRLoggerTest.m | 26 +++++++++++++++++++++++++ Package.swift | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/FirebaseCore/Extension/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h index 0a287f5335a..41c5653669f 100644 --- a/FirebaseCore/Extension/FIRLogger.h +++ b/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index cefb07d904b..b9aa3d96db9 100644 --- a/FirebaseCore/Sources/FIRLogger.m +++ b/FirebaseCore/Sources/FIRLogger.m @@ -90,6 +90,10 @@ void FIRLoggerInitializeASL(void) { sFIRAnalyticsDebugMode = analyticsDebugMode; } +FIRLoggerLevel FIRGetLoggerLevel(void) { + return (FIRLoggerLevel)GULGetLoggerLevel(); +} + void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel) { FIRLoggerInitializeASL(); GULSetLoggerLevel((GULLoggerLevel)loggerLevel); diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index a289faafd1f..3a63f46c25f 100644 --- a/FirebaseCore/Tests/Unit/FIRLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRLoggerTest.m @@ -185,5 +185,31 @@ - (void)testFIRLoggerLevelValues { XCTAssertEqual(FIRLoggerLevelDebug, ASL_LEVEL_DEBUG); } +- (void)testFIRGetLoggerLevel { + FIRLoggerLevel loggerLevel = FIRGetLoggerLevel(); + + // The default logger level is FIRLoggerLevelNotice. + XCTAssertEqual(loggerLevel, FIRLoggerLevelNotice); +} + +- (void)testFIRSetLoggerLevel { + FIRSetLoggerLevel(FIRLoggerLevelDebug); + + FIRLoggerLevel loggerLevel = FIRGetLoggerLevel(); + + // The default logger level is FIRLoggerLevelNotice. + XCTAssertEqual(loggerLevel, FIRLoggerLevelDebug); +} + +- (void)testFIRResetLogger_ResetsLoggerLevel { + FIRSetLoggerLevel(FIRLoggerLevelDebug); + + FIRResetLogger(); + FIRLoggerLevel loggerLevel = FIRGetLoggerLevel(); + + // The default logger level is FIRLoggerLevelNotice. + XCTAssertEqual(loggerLevel, FIRLoggerLevelNotice); +} + @end #endif diff --git a/Package.swift b/Package.swift index 09c8484f34f..7d742bbdfc5 100644 --- a/Package.swift +++ b/Package.swift @@ -154,7 +154,7 @@ let package = Package( ), .package( url: "https://github.com/google/GoogleUtilities.git", - "7.11.0" ..< "8.0.0" + "7.12.0" ..< "8.0.0" ), .package( url: "https://github.com/google/gtm-session-fetcher.git",