Merge pull request #3648 from DataDog/tvaleev/feature/RUM-16627

RUM-16627: Mixing in DdTags for web view event.

Co-authored-by: satween <timur.valeev@datadoghq.com>

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-sdk-android-core/api/apiSurface

@@ -345,6 +345,11 @@ fun java.util.concurrent.ScheduledExecutorService.scheduleSafe(String, Long, jav
 fun java.util.concurrent.ExecutorService.submitSafe(String, com.datadog.android.api.InternalLogger, Runnable): java.util.concurrent.Future<*>?
 fun <T> java.util.concurrent.ExecutorService.submitSafe(String, com.datadog.android.api.InternalLogger, java.util.concurrent.Callable<T>): java.util.concurrent.Future<T>?
 fun <T> java.util.concurrent.Future<T>?.getSafe(String, com.datadog.android.api.InternalLogger): T?
+object com.datadog.android.core.internal.utils.DdTagsUtils
+  fun toDdTagsString(com.datadog.android.api.context.DatadogContext): String
+  fun toDdTagsString(Map<String, String>): String
+  fun toDdTagsMap(com.datadog.android.api.context.DatadogContext): Map<String, String>
+  fun toDdTagsMap(String?): Map<String, String>?
 object com.datadog.android.core.internal.utils.JsonSerializer
   fun toJsonElement(Any?): com.google.gson.JsonElement
   fun Map<String, Any?>.safeMapValuesToJson(com.datadog.android.api.InternalLogger): Map<String, com.google.gson.JsonElement>

dd-sdk-android-core/api/dd-sdk-android-core.api

@@ -901,6 +901,14 @@ public final class com/datadog/android/core/internal/utils/ConcurrencyExtKt {
 	public static final fun submitSafe (Ljava/util/concurrent/ExecutorService;Ljava/lang/String;Lcom/datadog/android/api/InternalLogger;Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Future;
 }
 
+public final class com/datadog/android/core/internal/utils/DdTagsUtils {
+	public static final field INSTANCE Lcom/datadog/android/core/internal/utils/DdTagsUtils;
+	public final fun toDdTagsMap (Lcom/datadog/android/api/context/DatadogContext;)Ljava/util/Map;
+	public final fun toDdTagsMap (Ljava/lang/String;)Ljava/util/Map;
+	public final fun toDdTagsString (Lcom/datadog/android/api/context/DatadogContext;)Ljava/lang/String;
+	public final fun toDdTagsString (Ljava/util/Map;)Ljava/lang/String;
+}
+
 public final class com/datadog/android/core/internal/utils/JsonSerializer {
 	public static final field INSTANCE Lcom/datadog/android/core/internal/utils/JsonSerializer;
 	public final fun safeMapValuesToJson (Ljava/util/Map;Lcom/datadog/android/api/InternalLogger;)Ljava/util/Map;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/utils/DdTagsUtils.kt

@@ -0,0 +1,82 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.android.core.internal.utils
+
+import com.datadog.android.api.context.DatadogContext
+import com.datadog.android.lint.InternalApi
+
+/**
+ * Utilities for building and parsing Datadog tags strings and maps.
+ */
+@Suppress("PackageNameVisibility")
+object DdTagsUtils {
+
+    internal const val TAG_SERVICE = "service"
+    internal const val TAG_VERSION = "version"
+    internal const val TAG_SDK_VERSION = "sdk_version"
+    internal const val TAG_ENV = "env"
+    internal const val TAG_VARIANT = "variant"
+
+    private const val TAGS_SEPARATOR = ","
+    private const val KEY_VALUE_SEPARATOR = ":"
+
+    /**
+     * Builds a Datadog tags string from a [DatadogContext].
+     */
+    @InternalApi
+    fun toDdTagsString(ddContext: DatadogContext): String = buildString {
+        append(TAG_SERVICE).append(KEY_VALUE_SEPARATOR).append(ddContext.service).append(TAGS_SEPARATOR)
+        append(TAG_VERSION).append(KEY_VALUE_SEPARATOR).append(ddContext.version).append(TAGS_SEPARATOR)
+        append(TAG_SDK_VERSION).append(KEY_VALUE_SEPARATOR).append(ddContext.sdkVersion).append(TAGS_SEPARATOR)
+        append(TAG_ENV).append(KEY_VALUE_SEPARATOR).append(ddContext.env)
+        if (ddContext.variant.isNotEmpty()) {
+            append(TAGS_SEPARATOR).append(TAG_VARIANT).append(KEY_VALUE_SEPARATOR).append(ddContext.variant)
+        }
+    }
+
+    /**
+     * Builds a Datadog tags string from a map of tag key-value pairs.
+     */
+    @InternalApi
+    fun toDdTagsString(tags: Map<String, String>): String = tags.entries.joinToString(TAGS_SEPARATOR) {
+        "${it.key}${KEY_VALUE_SEPARATOR}${it.value}"
+    }
+
+    /**
+     * Builds a Datadog tags map directly from a [DatadogContext].
+     */
+    @Suppress("UnsafeThirdPartyFunctionCall")
+    @InternalApi
+    fun toDdTagsMap(ddContext: DatadogContext): Map<String, String> = LinkedHashMap<String, String>().apply {
+        put(TAG_SERVICE, ddContext.service)
+        put(TAG_VERSION, ddContext.version)
+        put(TAG_SDK_VERSION, ddContext.sdkVersion)
+        put(TAG_ENV, ddContext.env)
+
+        if (ddContext.variant.isNotEmpty()) {
+            put(TAG_VARIANT, ddContext.variant)
+        }
+    }
+
+    /**
+     * Parses a Datadog tags string into a [Map].
+     */
+    @Suppress("UnsafeThirdPartyFunctionCall")
+    @InternalApi
+    fun toDdTagsMap(tagsString: String?): Map<String, String>? = LinkedHashMap<String, String>().also { tagsMap ->
+        val tags = tagsString?.split(TAGS_SEPARATOR)
+        if (tags.isNullOrEmpty()) return null
+        for (tag in tags) {
+            val keyValue = tag.split(KEY_VALUE_SEPARATOR, limit = 2)
+                .takeIf { it.size == 2 && it[0].isNotEmpty() && it[1].isNotEmpty() }
+                ?: continue
+
+            tagsMap[keyValue[0]] = keyValue[1]
+        }
+        if (tagsMap.isEmpty()) return null
+    }
+}