Merge pull request #2660 from DataDog/tvaleev/feature/RUM-9491

RUM-9491: Moving all changes into v3

Author: satween

.gitlab-ci.yml

@@ -126,6 +126,7 @@ analysis:detekt-custom:
     - ./gradlew :features:dd-sdk-android-session-replay:customDetektRules
     - ./gradlew :features:dd-sdk-android-session-replay-material:customDetektRules
     - ./gradlew :features:dd-sdk-android-session-replay-compose:customDetektRules
+    - ./gradlew :features:dd-sdk-android-trace-internal:customDetektRules
     - ./gradlew :features:dd-sdk-android-trace:customDetektRules
     - ./gradlew :features:dd-sdk-android-trace-otel:customDetektRules
     - ./gradlew :features:dd-sdk-android-webview:customDetektRules
@@ -735,6 +736,18 @@ publish:release-okhttp-otel:
     - !reference [.snippets, set-publishing-credentials]
     - ./gradlew :integrations:dd-sdk-android-okhttp-otel:publishToSonatype --stacktrace --no-daemon
 
+publish:release-trace-internal:
+  tags: [ "arch:amd64" ]
+  only:
+    - tags
+    - develop
+  image: $CI_IMAGE_DOCKER
+  stage: publish
+  timeout: 30m
+  script:
+    - !reference [ .snippets, set-publishing-credentials ]
+    - ./gradlew :features:dd-sdk-android-trace-internal:publishToSonatype --stacktrace --no-daemon
+
 publish:release-trace:
   tags: [ "arch:amd64" ]
   only:

features/dd-sdk-android-rum/api/apiSurface

@@ -7,7 +7,6 @@ class com.datadog.android.rum.DdRumContentProvider : android.content.ContentProv
   override fun delete(android.net.Uri, String?, Array<String>?): Int
   override fun update(android.net.Uri, android.content.ContentValues?, String?, Array<String>?): Int
 annotation com.datadog.android.rum.ExperimentalRumApi
-typealias GlobalRum = GlobalRumMonitor
 object com.datadog.android.rum.GlobalRumMonitor
   fun isRegistered(com.datadog.android.api.SdkCore = Datadog.getInstance()): Boolean
   fun get(com.datadog.android.api.SdkCore = Datadog.getInstance()): RumMonitor

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/GlobalRum.kt

@@ -0,0 +1,18 @@
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+build/

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt

@@ -0,0 +1,4 @@
+object com.datadog.android.trace.internal.domain.event.BigIntegerUtils
+  fun leastSignificant64BitsAsHex(java.math.BigInteger): String
+  fun leastSignificant64BitsAsDecimal(java.math.BigInteger): String
+  fun mostSignificant64BitsAsHex(java.math.BigInteger): String

features/dd-sdk-android-trace-internal/.gitignore

@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+@file:Suppress("StringLiteralDuplication")
+
+import com.datadog.gradle.config.androidLibraryConfig
+import com.datadog.gradle.config.dependencyUpdateConfig
+import com.datadog.gradle.config.detektCustomConfig
+import com.datadog.gradle.config.javadocConfig
+import com.datadog.gradle.config.junitConfig
+import com.datadog.gradle.config.kotlinConfig
+import com.datadog.gradle.config.publishingConfig
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    // Build
+    id("com.android.library")
+    kotlin("android")
+    id("com.google.devtools.ksp")
+
+    // Publish
+    `maven-publish`
+    signing
+    id("org.jetbrains.dokka")
+
+    // Analysis tools
+    id("com.github.ben-manes.versions")
+
+    // Tests
+    id("de.mobilej.unmock")
+    id("org.jetbrains.kotlinx.kover")
+
+    // Internal Generation
+    id("com.datadoghq.dependency-license")
+    id("apiSurface")
+    id("transitiveDependencies")
+    id("binary-compatibility-validator")
+}
+
+android {
+    defaultConfig {
+        consumerProguardFiles("consumer-rules.pro")
+    }
+    namespace = "com.datadog.android.trace.internal"
+}
+
+dependencies {
+    api(project(":dd-sdk-android-core"))
+    implementation(project(":dd-sdk-android-internal"))
+    implementation(libs.gson)
+    implementation(libs.androidXAnnotation)
+    implementation(libs.bundles.traceCore)
+
+    // OpenTracing
+    api(libs.bundles.openTracing)
+
+    testImplementation(project(":tools:unit")) {
+        attributes {
+            attribute(
+                com.android.build.api.attributes.ProductFlavorAttr.of("platform"),
+                objects.named("jvm")
+            )
+        }
+    }
+    testImplementation(testFixtures(project(":dd-sdk-android-core")))
+    testImplementation(libs.bundles.jUnit5)
+    testImplementation(libs.bundles.testTools)
+    testImplementation(libs.systemStubsJupiter)
+}
+
+unMock {
+    keepStartingWith("org.json")
+}
+
+apply(from = "clone_dd_trace.gradle.kts")
+
+kotlinConfig(jvmBytecodeTarget = JvmTarget.JVM_11)
+androidLibraryConfig()
+junitConfig()
+javadocConfig()
+dependencyUpdateConfig()
+publishingConfig(
+    "Internal APM support library for Android applications."
+)
+detektCustomConfig(":dd-sdk-android-core", ":dd-sdk-android-internal")