Merge pull request #3059 from DataDog/yl/profiling/fix-null-build-id

Fix null build id in profile event tags

Author: ambushwork

features/dd-sdk-android-profiling/src/main/java/com/datadog/android/profiling/internal/ProfilingDataWriter.kt

@@ -105,8 +105,10 @@ internal class ProfilingDataWriter(
         append("$TAG_KEY_VERSION:${context.version}")
         append(",")
         append("$TAG_KEY_SDK_VERSION:${context.sdkVersion}")
-        append(",")
-        append("$TAG_KEY_BUILD_ID:${context.appBuildId}")
+        context.appBuildId?.let { buildId ->
+            append(",")
+            append("$TAG_KEY_BUILD_ID:$buildId")
+        }
     }
 
     private fun readProfilingData(profilingPath: String): ByteArray? {

features/dd-sdk-android-profiling/src/test/kotlin/com/datadog/android/profiling/internal/ProfilingDataWriterTest.kt

@@ -121,22 +121,24 @@ internal class ProfilingDataWriterTest {
             eventType = eq(EventType.DEFAULT)
         )
         val actualEvent = ProfileEvent.fromJson(String(argumentCaptor.firstValue.data))
+        val expectedTagList = arrayListOf(
+            "service:${fakeDatadogContext.service}",
+            "env:${fakeDatadogContext.env}",
+            "version:${fakeDatadogContext.version}",
+            "sdk_version:${fakeDatadogContext.sdkVersion}"
+        )
+        fakeDatadogContext.appBuildId?.let {
+            expectedTagList.add("build_id:${fakeDatadogContext.appBuildId}")
+        }
+
         assertThat(actualEvent)
             .hasStart(formatIsoUtc(fakeResult.start))
             .hasEnd(formatIsoUtc(fakeResult.end))
             .hasAttachments(listOf("perfetto.proto"))
             .hasFamily("android")
             .hasRuntime("android")
             .hasVersion("4")
-            .hasTags(
-                listOf(
-                    "service:${fakeDatadogContext.service}",
-                    "env:${fakeDatadogContext.env}",
-                    "version:${fakeDatadogContext.version}",
-                    "sdk_version:${fakeDatadogContext.sdkVersion}",
-                    "build_id:${fakeDatadogContext.appBuildId}"
-                )
-            )
+            .hasTags(expectedTagList)
             .hasApplicationId(fakeTTIDEvent.applicationId)
             .hasSessionId(fakeTTIDEvent.sessionId)
             .hasVitalId(fakeTTIDEvent.vitalId)