-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
05624c1
commit 9981650
Showing
7 changed files
with
231 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* Copyright (c) 2021-Present, Okta, Inc. and/or its affiliates. All rights reserved. | ||
* The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (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 Instabug | ||
|
||
/** | ||
Concrete logging class for Instabug. | ||
*/ | ||
open class OktaLoggerInstabugLogger: OktaLoggerDestinationBase { | ||
|
||
override open func log(level: OktaLoggerLogLevel, eventName: String, message: String?, properties: [AnyHashable: Any]?, file: String, line: NSNumber, funcName: String) { | ||
guard Instabug.enabled else { | ||
return | ||
} | ||
let logString = self.stringValue( | ||
level: level, | ||
eventName: eventName, | ||
message: message, | ||
file: file, | ||
line: line, | ||
funcName: funcName | ||
) | ||
switch level { | ||
case .all: | ||
IBGLog.logVerbose(logString) | ||
case .debug: | ||
IBGLog.logDebug(logString) | ||
case .info, .uiEvent: | ||
IBGLog.logInfo(logString) | ||
case .warning: | ||
IBGLog.logWarn(logString) | ||
case .error: | ||
IBGLog.logError(logString) | ||
case .off: | ||
return | ||
default: | ||
return | ||
} | ||
} | ||
|
||
open override func stringValue(level: OktaLoggerLogLevel, eventName: String, message: String?, file: String, line: NSNumber, funcName: String) -> String { | ||
let fileLogString = file.split(separator: "/").last ?? "" | ||
let messageLogString: String = { | ||
guard let message = message else { | ||
return "" | ||
} | ||
return ". \(message)" | ||
}() | ||
return "\(eventName)\(messageLogString) | \(fileLogString):\(funcName):\(line)" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* Copyright (c) 2021-Present, Okta, Inc. and/or its affiliates. All rights reserved. | ||
* The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (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 | ||
@testable import OktaLogger | ||
|
||
class OktaLoggerInstabugLoggerTests: XCTestCase { | ||
|
||
var instabugLogger: OktaLoggerInstabugLogger! | ||
|
||
override func setUp() { | ||
super.setUp() | ||
instabugLogger = OktaLoggerInstabugLogger( | ||
identifier: "instabug-logger", | ||
level: .all, | ||
defaultProperties: nil | ||
) | ||
} | ||
|
||
func testStringValueMessageNotNil() { | ||
let actualLog = instabugLogger.stringValue( | ||
level: .info, | ||
eventName: "Test event", | ||
message: "Test message", | ||
file: "OktaLoggerInstabugLoggerTests.swift", | ||
line: 29, | ||
funcName: "testStringValueMessageNotNil()" | ||
) | ||
XCTAssertEqual(actualLog, "Test event. Test message | OktaLoggerInstabugLoggerTests.swift:testStringValueMessageNotNil():29") | ||
} | ||
|
||
func testStringValueMessageNil() { | ||
let actualLog = instabugLogger.stringValue( | ||
level: .info, | ||
eventName: "Test event", | ||
message: nil, | ||
file: "OktaLoggerInstabugLoggerTests.swift", | ||
line: 29, | ||
funcName: "testStringValueMessageNotNil()" | ||
) | ||
XCTAssertEqual(actualLog, "Test event | OktaLoggerInstabugLoggerTests.swift:testStringValueMessageNotNil():29") | ||
} | ||
|
||
func testStringValueNoFileName() { | ||
let actualLog = instabugLogger.stringValue( | ||
level: .info, | ||
eventName: "Test event", | ||
message: "Test message", | ||
file: "", | ||
line: 29, | ||
funcName: "testStringValueMessageNotNil()" | ||
) | ||
XCTAssertEqual(actualLog, "Test event. Test message | :testStringValueMessageNotNil():29") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.