Fix build

features/dd-sdk-android-flags-openfeature/build.gradle.kts

@@ -80,10 +80,8 @@ androidLibraryConfig()
 junitConfig()
 javadocConfig()
 dependencyUpdateConfig()
-/*
-// publishingConfig(
-//     "OpenFeature Provider integration for the Datadog Feature Flags " +
-//         "library for Android applications."
-// )
-*/
+publishingConfig(
+    "OpenFeature Provider integration for the Datadog Feature Flags " +
+        "library for Android applications."
+)
 detektCustomConfig()

features/dd-sdk-android-flags/build.gradle.kts

@@ -91,10 +91,8 @@ androidLibraryConfig()
 junitConfig()
 javadocConfig()
 dependencyUpdateConfig()
-/*
-// publishingConfig(
-//     "The Feature Flags integration feature to use with the Datadog monitoring " +
-//         "library for Android applications."
-// )
-*/
+publishingConfig(
+    "The Feature Flags integration feature to use with the Datadog monitoring " +
+        "library for Android applications."
+)
 detektCustomConfig()

sample/automotive/build.gradle.kts

@@ -59,7 +59,7 @@ android {
 
 dependencies {
     // Datadog Libraries
-    // implementation(project(":features:dd-sdk-android-logs"))
+    implementation(project(":features:dd-sdk-android-logs"))
     implementation(project(":features:dd-sdk-android-rum"))
 
     implementation(libs.kotlin)

sample/benchmark/build.gradle.kts

@@ -104,15 +104,15 @@ dependencies {
     implementation(libs.coroutinesCore)
     implementation(libs.bundles.ktorClient)
     implementation(libs.kotlinxSerializationJson)
-    // implementation(project(":features:dd-sdk-android-logs"))
+    implementation(project(":features:dd-sdk-android-logs"))
     implementation(project(":features:dd-sdk-android-rum"))
     implementation(project(":features:dd-sdk-android-trace"))
     implementation(project(":features:dd-sdk-android-trace-otel"))
     implementation(project(":features:dd-sdk-android-ndk"))
     implementation(project(":features:dd-sdk-android-webview"))
-    // implementation(project(":features:dd-sdk-android-session-replay"))
-    // implementation(project(":features:dd-sdk-android-session-replay-material"))
-    // implementation(project(":features:dd-sdk-android-session-replay-compose"))
+    implementation(project(":features:dd-sdk-android-session-replay"))
+    implementation(project(":features:dd-sdk-android-session-replay-material"))
+    implementation(project(":features:dd-sdk-android-session-replay-compose"))
     implementation(project(":integrations:dd-sdk-android-compose"))
     implementation(project(":integrations:dd-sdk-android-glide"))
     implementation(project(":integrations:dd-sdk-android-okhttp"))

sample/tv/build.gradle.kts

@@ -74,11 +74,11 @@ dependencies {
 
     implementation(project(":dd-sdk-android-core"))
     implementation(project(":features:dd-sdk-android-rum"))
-    // implementation(project(":features:dd-sdk-android-logs"))
-    // implementation(project(":features:dd-sdk-android-session-replay"))
-    // implementation(project(":features:dd-sdk-android-session-replay-material"))
+    implementation(project(":features:dd-sdk-android-logs"))
+    implementation(project(":features:dd-sdk-android-session-replay"))
+    implementation(project(":features:dd-sdk-android-session-replay-material"))
     implementation(project(":integrations:dd-sdk-android-okhttp"))
-    // implementation(project(":integrations:dd-sdk-android-timber"))
+    implementation(project(":integrations:dd-sdk-android-timber"))
     implementation(project(":integrations:dd-sdk-android-tv"))
 
     implementation(libs.kotlin)

sample/tv/src/main/java/com/datadog/android/tv/sample/TvSampleApplication.kt

@@ -14,9 +14,9 @@ import com.datadog.android.core.configuration.BatchSize
 import com.datadog.android.core.configuration.Configuration
 import com.datadog.android.core.configuration.UploadFrequency
 import com.datadog.android.core.sampling.RateBasedSampler
-// import com.datadog.android.log.Logger
-// import com.datadog.android.log.Logs
-// import com.datadog.android.log.LogsConfiguration
+import com.datadog.android.log.Logger
+import com.datadog.android.log.Logs
+import com.datadog.android.log.LogsConfiguration
 import com.datadog.android.okhttp.DatadogEventListener
 import com.datadog.android.okhttp.DatadogInterceptor
 import com.datadog.android.okhttp.trace.TracingInterceptor
@@ -25,13 +25,13 @@ import com.datadog.android.rum.GlobalRumMonitor
 import com.datadog.android.rum.Rum
 import com.datadog.android.rum.RumConfiguration
 import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
-// import com.datadog.android.sessionreplay.ImagePrivacy
-// import com.datadog.android.sessionreplay.SessionReplay
-// import com.datadog.android.sessionreplay.SessionReplayConfiguration
-// import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
-// import com.datadog.android.sessionreplay.TextAndInputPrivacy
-// import com.datadog.android.sessionreplay.TouchPrivacy
-// import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
+import com.datadog.android.sessionreplay.ImagePrivacy
+import com.datadog.android.sessionreplay.SessionReplay
+import com.datadog.android.sessionreplay.SessionReplayConfiguration
+import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
+import com.datadog.android.sessionreplay.TextAndInputPrivacy
+import com.datadog.android.sessionreplay.TouchPrivacy
+import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
 import com.datadog.android.timber.DatadogTree
 import com.datadog.android.tv.sample.net.OkHttpDownloader
 import okhttp3.OkHttpClient
@@ -64,11 +64,11 @@ class TvSampleApplication : Application() {
         val rumConfig = createRumConfiguration()
         Rum.enable(rumConfig)
 
-        // val logsConfig = LogsConfiguration.Builder().build()
-        // Logs.enable(logsConfig)
+        val logsConfig = LogsConfiguration.Builder().build()
+        Logs.enable(logsConfig)
 
-        // val sessionReplayConfig = createSessionReplayConfiguration()
-        // SessionReplay.enable(sessionReplayConfig)
+        val sessionReplayConfig = createSessionReplayConfiguration()
+        SessionReplay.enable(sessionReplayConfig)
 
         GlobalRumMonitor.get().debug = true
     }

sample/vendor-lib/build.gradle.kts

@@ -70,7 +70,7 @@ android {
 
 dependencies {
 
-    // implementation(project(":features:dd-sdk-android-logs"))
+    implementation(project(":features:dd-sdk-android-logs"))
     implementation(project(":features:dd-sdk-android-trace"))
     implementation(project(":features:dd-sdk-android-trace-otel"))
     implementation(project(":integrations:dd-sdk-android-okhttp"))

sample/vendor-lib/src/main/kotlin/com/datadog/android/vendor/sample/LocalServer.kt

@@ -13,9 +13,9 @@ import com.datadog.android.FlashcatSite
 import com.datadog.android.core.configuration.BatchSize
 import com.datadog.android.core.configuration.Configuration
 import com.datadog.android.core.configuration.UploadFrequency
-// import com.datadog.android.log.Logger
-// import com.datadog.android.log.Logs
-// import com.datadog.android.log.LogsConfiguration
+import com.datadog.android.log.Logger
+import com.datadog.android.log.Logs
+import com.datadog.android.log.LogsConfiguration
 import com.datadog.android.privacy.TrackingConsent
 import com.datadog.android.trace.Trace
 import com.datadog.android.trace.TraceConfiguration
@@ -75,15 +75,15 @@ public class LocalServer {
         instance.setUserInfo(id = context.packageName)
         instance.setAccountInfo(id = context.packageName)
 
-        // val logsConfig = LogsConfiguration.Builder()
-        //     .build()
-        // Logs.enable(logsConfig, instance)
+        val logsConfig = LogsConfiguration.Builder()
+            .build()
+        Logs.enable(logsConfig, instance)
 
         val tracesConfig = TraceConfiguration.Builder().build()
         Trace.enable(tracesConfig)
-        // logger = Logger.Builder(instance)
-        //     .setLogcatLogsEnabled(true)
-        //     .build()
+        logger = Logger.Builder(instance)
+            .setLogcatLogsEnabled(true)
+            .build()
     }
 
     /**
@@ -92,7 +92,7 @@ public class LocalServer {
      */
     @Suppress("MagicNumber")
     fun start(redirectedUrl: String) {
-        // logger.i("Starting the server")
+        logger.i("Starting the server")
         engine = embeddedServer(Netty, PORT) {
             val tracerProvider = OtelTracerProvider.Builder().setService(SERVICE_NAME).build()
             val tracer = tracerProvider.get("ktor")
@@ -101,15 +101,13 @@ public class LocalServer {
             install(SSE)
             routing {
                 get(GET_PATH) {
-                    /*
                     logger.i(
                         "Redirecting request",
                         attributes = mapOf(
                             "redirection.from" to LOCAL_URL,
                             "redirection.to" to redirectedUrl
                         )
                     )
-                    */
                     val redirectSpan = tracer.spanBuilder("redirect").startSpan()
                     redirectSpan.setAttribute("redirection.from", LOCAL_URL)
                     redirectSpan.setAttribute("redirection.to", redirectedUrl)
@@ -136,10 +134,10 @@ public class LocalServer {
      * Stop the redirection.
      */
     fun stop() {
-        // logger.i("Stopping the server")
+        logger.i("Stopping the server")
         Thread {
             engine?.stop(SHUTDOWN_MS, STOP_TIMEOUT_MS)
-            // logger.i("Server stopped")
+            logger.i("Server stopped")
         }.start()
     }
 

sample/wear/build.gradle.kts

@@ -69,7 +69,7 @@ dependencies {
 
     implementation(project(":features:dd-sdk-android-ndk"))
     implementation(project(":features:dd-sdk-android-rum"))
-    // implementation(project(":features:dd-sdk-android-logs"))
+    implementation(project(":features:dd-sdk-android-logs"))
     implementation(project(":features:dd-sdk-android-trace"))
     implementation(project(":features:dd-sdk-android-trace-otel"))