Skip to content

Commit 66708d1

Browse files
committed
chore: improved names and lint fixes
1 parent 3ed87a6 commit 66708d1

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.onesignal.debug.internal.crash
22

33
internal interface IOneSignalCrashReporter {
4-
suspend fun sendCrash(thread: Thread, throwable: Throwable)
4+
suspend fun saveCrash(thread: Thread, throwable: Throwable)
55
}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/crash/OneSignalCrashHandler.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ internal class OneSignalCrashHandler(
2525
// more than once. This would only happen if there was another crash
2626
// handler and was faulty in a specific way.
2727
synchronized(seenThrowables) {
28-
if (seenThrowables.contains(throwable))
28+
if (seenThrowables.contains(throwable)) {
2929
return
30+
}
3031
seenThrowables.add(throwable)
3132
}
3233

@@ -55,8 +56,8 @@ internal class OneSignalCrashHandler(
5556
*
5657
* NOTE: addShutdownHook() isn't a workaround as it doesn't fire for
5758
* Process.killProcess, which KillApplicationHandler calls.
58-
*/
59-
runBlocking { _crashReporter.sendCrash(thread, throwable) }
59+
*/
60+
runBlocking { _crashReporter.saveCrash(thread, throwable) }
6061
existingHandler?.uncaughtException(thread, throwable)
6162
}
6263
}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/OneSignalOpenTelemetry.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,23 @@ internal abstract class OneSignalOpenTelemetryBase(
2626
private val _osPerEventFields: OneSignalOtelFieldsPerEvent,
2727
) : IOneSignalOpenTelemetry {
2828
private val lock = Any()
29-
private var sdk: OpenTelemetrySdk? = null
29+
private var sdkCachedValue: OpenTelemetrySdk? = null
30+
3031
protected suspend fun getSdk(): OpenTelemetrySdk {
3132
val attributes = _osTopLevelFields.getAttributes()
3233
synchronized(lock) {
33-
var localSdk = sdk
34+
var localSdk = sdkCachedValue
3435
if (localSdk != null) {
3536
return localSdk
3637
}
3738

3839
localSdk = getSdkInstance(attributes)
39-
sdk = localSdk
40+
sdkCachedValue = localSdk
4041
return localSdk
4142
}
4243
}
4344

44-
protected abstract fun getSdkInstance(attributes: Map<String, String>): OpenTelemetrySdk
45+
protected abstract fun getSdkInstance(attributes: Map<String, String>): OpenTelemetrySdk
4546

4647
override suspend fun forceFlush(): CompletableResultCode {
4748
val sdkLoggerProvider = getSdk().sdkLoggerProvider
@@ -53,7 +54,8 @@ internal abstract class OneSignalOpenTelemetryBase(
5354
}
5455

5556
override suspend fun getLogger(): LogRecordBuilder =
56-
getSdk().sdkLoggerProvider
57+
getSdk()
58+
.sdkLoggerProvider
5759
.loggerBuilder("loggerBuilder")
5860
.build()
5961
.logRecordBuilder()
@@ -106,6 +108,5 @@ internal class OneSignalOpenTelemetryCrashLocal(
106108
_crashPathProvider.path,
107109
_crashPathProvider.minFileAgeForReadMillis,
108110
)
109-
)
110-
.build()
111+
).build()
111112
}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/attributes/OneSignalOtelFieldsPerEvent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ internal class OneSignalOtelFieldsPerEvent(
2020
.putIfValueNotNull(
2121
"$OS_OTEL_NAMESPACE.onesignal_id",
2222
onesignalId
23-
)
24-
.putIfValueNotNull(
23+
).putIfValueNotNull(
2524
"$OS_OTEL_NAMESPACE.push_subscription_id",
2625
subscriptionId
2726
)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/config/OtelConfigRemoteOneSignal.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal class OtelConfigRemoteOneSignal {
2727
}
2828

2929
object SdkLoggerProviderConfig {
30-
// TODO: Switch to sdklogs.onesignal.com
30+
// TODO: Switch to https://sdklogs.onesignal.com:443/sdk/otel
3131
const val BASE_URL = "https://api.honeycomb.io:443"
3232

3333
@RequiresApi(Build.VERSION_CODES.O)
@@ -40,7 +40,7 @@ internal class OtelConfigRemoteOneSignal {
4040
.setResource(resource)
4141
.addLogRecordProcessor(
4242
OtelConfigShared.LogRecordProcessorConfig.batchLogRecordProcessor(
43-
HttpRecordBatchExporter.create(extraHttpHeaders)
43+
HttpRecordBatchExporter.create(extraHttpHeaders)
4444
)
4545
).setLogLimits(LogLimitsConfig::logLimits)
4646
.build()

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/crash/OneSignalCrashReporterOtel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ internal class OneSignalCrashReporterOtel(
1313
private const val OTEL_EXCEPTION_TYPE = "exception.type"
1414
private const val OTEL_EXCEPTION_MESSAGE = "exception.message"
1515
private const val OTEL_EXCEPTION_STACKTRACE = "exception.stacktrace"
16-
1716
}
1817

19-
override suspend fun sendCrash(thread: Thread, throwable: Throwable) {
18+
override suspend fun saveCrash(thread: Thread, throwable: Throwable) {
2019
val attributesBuilder =
2120
Attributes
2221
.builder()
@@ -28,7 +27,8 @@ internal class OneSignalCrashReporterOtel(
2827
.put("$OS_OTEL_NAMESPACE.exception.thread.name", thread.name)
2928
.build()
3029

31-
_openTelemetry.getLogger()
30+
_openTelemetry
31+
.getLogger()
3232
.setAllAttributes(attributesBuilder)
3333
.setSeverity(Severity.FATAL)
3434
.emit()

0 commit comments

Comments
 (0)