some more cleanup and fixes

Author: AR Abdul Azeez

OneSignalSDK/onesignal/otel/src/main/java/com/onesignal/otel/OneSignalOpenTelemetry.kt

@@ -17,24 +17,6 @@ internal fun LogRecordBuilder.setAllAttributes(attributes: Map<String, String>):
     return this
 }
 
-/**
- * Extension function to set all attributes from an Attributes object.
- * Made public so it can be used from other modules (e.g., core module for logging).
- */
-fun LogRecordBuilder.setAllAttributes(attributes: io.opentelemetry.api.common.Attributes): LogRecordBuilder {
-    attributes.forEach { key, value ->
-        val keyString = key.key
-        when (value) {
-            is String -> this.setAttribute(keyString, value)
-            is Long -> this.setAttribute(keyString, value)
-            is Double -> this.setAttribute(keyString, value)
-            is Boolean -> this.setAttribute(keyString, value)
-            else -> this.setAttribute(keyString, value.toString())
-        }
-    }
-    return this
-}
-
 internal abstract class OneSignalOpenTelemetryBase(
     private val osTopLevelFields: OtelFieldsTopLevel,
     private val osPerEventFields: OtelFieldsPerEvent,

OneSignalSDK/onesignal/otel/src/main/java/com/onesignal/otel/config/OtelConfigRemoteOneSignal.kt

@@ -10,10 +10,10 @@ import java.time.Duration
 
 internal class OtelConfigRemoteOneSignal {
     companion object {
-        const val OTEL_PATH = "sdk/otel"
+        const val OTEL_PATH = "sdk"
 
         fun buildEndpoint(apiBaseUrl: String, appId: String): String =
-            "$apiBaseUrl$OTEL_PATH/v1/logs?app_id=$appId"
+            "$apiBaseUrl$OTEL_PATH/log?app_id=$appId"
     }
 
     object LogRecordExporterConfig {
@@ -85,6 +85,28 @@ internal class OtelConfigRemoteOneSignal {
         private class LoggingLogRecordExporter(
             private val delegate: LogRecordExporter
         ) : LogRecordExporter {
+            @Suppress("TooGenericExceptionCaught")
+            private fun resolveHttpFailureMessage(throwable: Throwable?): String {
+                if (throwable == null) return "unknown"
+
+                return try {
+                    if (!throwable.javaClass.name.endsWith("FailedExportException\$HttpExportException")) {
+                        return throwable.message ?: "unknown"
+                    }
+
+                    val response = throwable.javaClass.getMethod("getResponse").invoke(throwable) ?: return throwable.message ?: "unknown"
+                    val statusCode = response.javaClass.getMethod("statusCode").invoke(response)
+                    val statusMessage = response.javaClass.getMethod("statusMessage").invoke(response)
+                    val responseBodyBytes = response.javaClass.getMethod("responseBody").invoke(response) as? ByteArray
+                    val responseBody = responseBodyBytes?.decodeToString()
+
+                    "status=$statusCode message=$statusMessage" +
+                        (if (responseBody.isNullOrBlank()) "" else " body=$responseBody")
+                } catch (_: Throwable) {
+                    throwable.message ?: "unknown"
+                }
+            }
+
             override fun export(logs: Collection<LogRecordData>): CompletableResultCode {
                 Log.d(TAG, "OTEL export request sent to backend. count=${logs.size}")
                 val result = delegate.export(logs)
@@ -93,9 +115,10 @@ internal class OtelConfigRemoteOneSignal {
                         Log.d(TAG, "OTEL export response received: success")
                     } else {
                         val throwable = result.failureThrowable
+                        val failureMessage = resolveHttpFailureMessage(throwable)
                         Log.e(
                             TAG,
-                            "OTEL export response received: failed${throwable?.let { " - ${it.message}" } ?: ""}",
+                            "OTEL export response received: failed - $failureMessage",
                             throwable
                         )
                     }

OneSignalSDK/onesignal/otel/src/test/java/com/onesignal/otel/OneSignalOpenTelemetryTest.kt

@@ -1,13 +1,15 @@
 package com.onesignal.otel
 
 import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.maps.shouldContainKey
+import io.kotest.matchers.maps.shouldNotContainKey
+import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.mockk.clearMocks
 import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.mockk
-import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.logs.LogRecordBuilder
 import kotlinx.coroutines.runBlocking
 
@@ -77,6 +79,15 @@ class OneSignalOpenTelemetryTest : FunSpec({
         }
     }
 
+    test("remote telemetry should only send SDK-Version header and not legacy OneSignal SDK header") {
+        val remoteTelemetry = OtelFactory.createRemoteTelemetry(mockPlatformProvider) as OneSignalOpenTelemetryRemote
+        val headers = remoteTelemetry.extraHttpHeaders
+
+        headers.shouldContainKey("SDK-Version")
+        headers["SDK-Version"] shouldBe "onesignal/android/5.0.0"
+        headers.shouldNotContainKey("X-OneSignal-SDK-Version")
+    }
+
     // ===== Crash Local Telemetry Tests =====
 
     test("createCrashLocalTelemetry should return IOtelOpenTelemetryCrash") {
@@ -126,23 +137,6 @@ class OneSignalOpenTelemetryTest : FunSpec({
         io.mockk.verify { mockBuilder.setAttribute("key2", "value2") }
     }
 
-    test("setAllAttributes with Attributes should handle different types") {
-        val mockBuilder = mockk<LogRecordBuilder>(relaxed = true)
-        val attributes = Attributes.builder()
-            .put("string.key", "string-value")
-            .put("long.key", 123L)
-            .put("double.key", 45.67)
-            .put("boolean.key", true)
-            .build()
-
-        mockBuilder.setAllAttributes(attributes)
-
-        io.mockk.verify { mockBuilder.setAttribute("string.key", "string-value") }
-        io.mockk.verify { mockBuilder.setAttribute("long.key", 123L) }
-        io.mockk.verify { mockBuilder.setAttribute("double.key", 45.67) }
-        io.mockk.verify { mockBuilder.setAttribute("boolean.key", true) }
-    }
-
     // ===== SDK Caching Tests =====
 
     test("remote telemetry should cache SDK instance") {

OneSignalSDK/onesignal/otel/src/test/java/com/onesignal/otel/config/OtelConfigTest.kt

@@ -59,15 +59,15 @@ class OtelConfigTest : FunSpec({
 
     test("buildEndpoint should construct correct URL from base and appId") {
         val endpoint = OtelConfigRemoteOneSignal.buildEndpoint("https://api.onesignal.com", "my-app")
-        endpoint shouldBe "https://api.onesignal.com/sdk/otel/v1/logs?app_id=my-app"
+        endpoint shouldBe "https://api.onesignal.com/sdk/log?app_id=my-app"
     }
 
     test("HttpRecordBatchExporter should create exporter with correct endpoint") {
         val headers = mapOf("X-Test-Header" to "test-value")
         val appId = "test-app-id"
         val apiBaseUrl = "https://api.onesignal.com"
 
-        val exporter = OtelConfigRemoteOneSignal.HttpRecordBatchExporter.create(headers, appId, apiBaseUrl)
+        val exporter = OtelConfigRemoteOneSignal.HttpRecordBatchExporter.create(headers, appId, apiBaseUrl, false)
 
         exporter shouldNotBe null
     }
@@ -93,6 +93,7 @@ class OtelConfigTest : FunSpec({
             headers,
             "test-app-id",
             "https://api.onesignal.com",
+            false,
         )
 
         provider shouldNotBe null