Added callingClass helper method

Author: nsingh-branch

Branch-TestBed/Branch-SDK-Tests/BranchLoggerTests.m

@@ -37,7 +37,7 @@ - (void)testLogLevelThresholdBlocksLowerLevels {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Log callback expectation for message that should pass the threshold"];
 
     [BranchLogger shared].logCallback = ^(NSString * _Nonnull message, BranchLogLevel logLevel, NSError * _Nullable error) {
-        if ([message isEqualToString:@"[BranchSDK][Debug] This message should trigger the log callback."] && logLevel >= BranchLogLevelDebug) {
+        if ([message isEqualToString:@"[BranchSDK][Debug][BranchLoggerTests testLogLevelThresholdBlocksLowerLevels] This message should trigger the log callback."] && logLevel >= BranchLogLevelDebug) {
             [expectation fulfill];
         }
     };
@@ -50,7 +50,7 @@ - (void)testLogLevelThresholdBlocksLowerLevels {
 
 - (void)testLogCallbackExecutesWithCorrectParameters {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Log callback expectation"];
-    NSString *expectedMessage = @"[BranchSDK][Info] Test message";
+    NSString *expectedMessage = @"[BranchSDK][Info][BranchLoggerTests testLogCallbackExecutesWithCorrectParameters] Test message";
     BranchLogLevel expectedLevel = BranchLogLevelInfo;
 
     [BranchLogger shared].logCallback = ^(NSString * _Nonnull message, BranchLogLevel logLevel, NSError * _Nullable error) {

BranchSDK/BranchLogger.m

@@ -49,9 +49,10 @@ - (void)logMessage:(NSString *)message withLevel:(BranchLogLevel)level error:(NS
         return;
     }
 
+    NSString *callerDetails = [self callingClass];
     NSString *logLevelString = [self stringForLogLevel:level];
     NSString *logTag = [NSString stringWithFormat:@"[BranchSDK][%@]", logLevelString];
-    NSMutableString *fullMessage = [NSMutableString stringWithFormat:@"%@ %@", logTag, message];
+    NSMutableString *fullMessage = [NSMutableString stringWithFormat:@"%@%@ %@", logTag, callerDetails, message];
 
     if (error) {
         [fullMessage appendFormat:@", Error: %@ (Domain: %@, Code: %ld)", error.localizedDescription, error.domain, (long)error.code];
@@ -66,6 +67,7 @@ - (void)logMessage:(NSString *)message withLevel:(BranchLogLevel)level error:(NS
     }
 }
 
+//MARK: Helper Methods
 - (os_log_type_t)osLogTypeForBranchLogLevel:(BranchLogLevel)level {
     switch (level) {
         case BranchLogLevelError: return OS_LOG_TYPE_FAULT;
@@ -88,4 +90,18 @@ - (NSString *)stringForLogLevel:(BranchLogLevel)level {
     }
 }
 
+- (NSString *)callingClass {
+    NSArray<NSString *> *stackSymbols = [NSThread callStackSymbols];
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"\\[([^\\]]+)\\]" options:0 error:nil];
+    if (stackSymbols.count > 3 && regex) {
+        NSString *callSite = stackSymbols[3];
+        NSTextCheckingResult *match = [regex firstMatchInString:callSite options:0 range:NSMakeRange(0, [callSite length])];
+        if (match && match.range.location != NSNotFound) {
+            NSString *callerDetails = [callSite substringWithRange:[match rangeAtIndex:0]];
+            return callerDetails;
+        }
+    }
+    return @"";
+}
+
 @end