diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/FlavorBuildConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/FlavorBuildConfig.kt
index 5005703ba7..9c015acb89 100644
--- a/buildSrc/src/main/kotlin/com/datadog/gradle/config/FlavorBuildConfig.kt
+++ b/buildSrc/src/main/kotlin/com/datadog/gradle/config/FlavorBuildConfig.kt
@@ -31,22 +31,22 @@ fun ApplicationDefaultConfig.configureFlavorForBenchmark(
     val config = sampleAppConfig("${rootDir.absolutePath}/config/benchmark.json")
     buildConfigField(
         "String",
-        "BM_RUM_APPLICATION_ID",
+        "BENCHMARK_RUM_APPLICATION_ID",
         "\"${config.rumApplicationId}\""
     )
     buildConfigField(
         "String",
-        "BM_CLIENT_TOKEN",
+        "BENCHMARK_CLIENT_TOKEN",
         "\"${config.token}\""
     )
     buildConfigField(
         "String",
-        "BM_API_KEY",
+        "BENCHMARK_API_KEY",
         "\"${config.apiKey}\""
     )
     buildConfigField(
         "String",
-        "BM_APPLICATION_KEY",
+        "BENCHMARK_APPLICATION_KEY",
         "\"${config.applicationKey}\""
     )
 }
diff --git a/sample/benchmark/src/main/AndroidManifest.xml b/sample/benchmark/src/main/AndroidManifest.xml
index a1d258065b..c077024498 100644
--- a/sample/benchmark/src/main/AndroidManifest.xml
+++ b/sample/benchmark/src/main/AndroidManifest.xml
@@ -10,12 +10,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Ddsdkandroid">
+        android:theme="@style/Theme.BenchmarkApp">
         <activity
             android:name="com.datadog.benchmark.sample.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.Ddsdkandroid">
+            android:theme="@style/Theme.BenchmarkApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkApplication.kt b/sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkApplication.kt
index ed15ce2aea..507140716b 100644
--- a/sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkApplication.kt
+++ b/sample/benchmark/src/main/java/com/datadog/benchmark/sample/BenchmarkApplication.kt
@@ -40,7 +40,7 @@ internal class BenchmarkApplication : Application() {
     }
 
     private fun createRumConfiguration(): RumConfiguration {
-        return RumConfiguration.Builder(BuildConfig.BM_RUM_APPLICATION_ID)
+        return RumConfiguration.Builder(BuildConfig.BENCHMARK_RUM_APPLICATION_ID)
             .useViewTrackingStrategy(
                 NavigationViewTrackingStrategy(
                     R.id.nav_host_fragment,
@@ -78,7 +78,7 @@ internal class BenchmarkApplication : Application() {
     @SuppressLint("LogNotTimber")
     private fun createDatadogConfiguration(): Configuration {
         val configBuilder = Configuration.Builder(
-            clientToken = BuildConfig.BM_CLIENT_TOKEN,
+            clientToken = BuildConfig.BENCHMARK_CLIENT_TOKEN,
             env = BuildConfig.BUILD_TYPE
         )
             .setBatchSize(BatchSize.SMALL)
diff --git a/sample/benchmark/src/main/java/com/datadog/benchmark/sample/benchmark/DatadogBenchmark.kt b/sample/benchmark/src/main/java/com/datadog/benchmark/sample/benchmark/DatadogBenchmark.kt
index 859c747e0f..ecf23a8e0b 100644
--- a/sample/benchmark/src/main/java/com/datadog/benchmark/sample/benchmark/DatadogBenchmark.kt
+++ b/sample/benchmark/src/main/java/com/datadog/benchmark/sample/benchmark/DatadogBenchmark.kt
@@ -23,7 +23,7 @@ import com.datadog.sample.benchmark.BuildConfig
 internal class DatadogBenchmark(config: Config) {
 
     private var meter: DatadogMeter = DatadogMeter.create(
-        DatadogExporterConfiguration.Builder(BuildConfig.BM_API_KEY)
+        DatadogExporterConfiguration.Builder(BuildConfig.BENCHMARK_API_KEY)
             .setApplicationId(BuildConfig.APPLICATION_ID)
             .setApplicationName(BENCHMARK_APPLICATION_NAME)
             .setRun(config.getRun())
diff --git a/sample/benchmark/src/main/res/values/themes.xml b/sample/benchmark/src/main/res/values/themes.xml
index c2f7bb1055..2fb331ccc5 100644
--- a/sample/benchmark/src/main/res/values/themes.xml
+++ b/sample/benchmark/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Ddsdkandroid" parent="Theme.MaterialComponents.Light.DarkActionBar" />
+    <style name="Theme.BenchmarkApp" parent="Theme.MaterialComponents.Light.DarkActionBar" />
 </resources>
\ No newline at end of file
diff --git a/tools/benchmark/build.gradle.kts b/tools/benchmark/build.gradle.kts
index 403f52aac0..d9447f1d3c 100644
--- a/tools/benchmark/build.gradle.kts
+++ b/tools/benchmark/build.gradle.kts
@@ -31,10 +31,9 @@ dependencies {
 
     implementation(libs.kotlin)
     implementation(libs.okHttp)
-    api(libs.openTelemetryApiBenchmark)
-    api(libs.openTelemetrySdkBenchmark)
+    implementation(libs.openTelemetryApiBenchmark)
+    implementation(libs.openTelemetrySdkBenchmark)
     implementation(libs.gson)
-    compileOnly(libs.detektApi)
     testImplementation(project(":tools:unit")) {
         attributes {
             attribute(
@@ -46,8 +45,6 @@ dependencies {
 
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
-    testImplementation(libs.detektTest)
-    testImplementation(libs.robolectric)
 }
 
 kotlinConfig()
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/EndPoint.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/EndPoint.kt
index fc002b6957..ccb1625be6 100644
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/EndPoint.kt
+++ b/tools/benchmark/src/main/java/com/datadog/benchmark/EndPoint.kt
@@ -30,9 +30,9 @@ enum class EndPoint(
         metrics = "https://api.datadoghq.eu/",
         traces = "https://public-trace-http-intake.logs.datadoghq.eu/"
     ),
-    US1_FED(
-        metrics = "https://api.ddog-gov.com/",
-        traces = "https://trace.browser-intake-ddog-gov.com/"
+    AP1(
+        metrics = "https://ap1.datadoghq.com",
+        traces = "https://browser-intake-ap1-datadoghq.com"
     );
 
     /**
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogsMetricExporter.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogcatMetricExporter.kt
similarity index 91%
rename from tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogsMetricExporter.kt
rename to tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogcatMetricExporter.kt
index f9de233a42..512a625706 100644
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogsMetricExporter.kt
+++ b/tools/benchmark/src/main/java/com/datadog/benchmark/exporter/LogcatMetricExporter.kt
@@ -17,7 +17,7 @@ import io.opentelemetry.sdk.metrics.data.AggregationTemporality
 import io.opentelemetry.sdk.metrics.data.MetricData
 import io.opentelemetry.sdk.metrics.export.MetricExporter
 
-internal class LogsMetricExporter(datadogExporterConfiguration: DatadogExporterConfiguration) : MetricExporter {
+internal class LogcatMetricExporter(datadogExporterConfiguration: DatadogExporterConfiguration) : MetricExporter {
 
     private val metricContext: MetricContext = MetricContext(
         deviceModel = Build.MODEL,
@@ -33,14 +33,10 @@ internal class LogsMetricExporter(datadogExporterConfiguration: DatadogExporterC
     }
 
     override fun export(metrics: Collection<MetricData>): CompletableResultCode {
-        print(metrics)
-        return CompletableResultCode.ofSuccess()
-    }
-
-    private fun print(metrics: Collection<MetricData>) {
         MetricRequestBodyBuilder(metricContext).buildJsonElement(metrics.toList()).toString().apply {
             Log.i("LogsMetricExporter", this)
         }
+        return CompletableResultCode.ofSuccess()
     }
 
     override fun flush(): CompletableResultCode {
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/ext/FileExt.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/ext/FileExt.kt
deleted file mode 100644
index 639946e98e..0000000000
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/ext/FileExt.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.benchmark.ext
-
-import java.io.File
-import java.nio.charset.Charset
-
-/*
- * The java.lang.File class throws a SecurityException for the following calls:
- * - canRead()
- * - canWrite()
- * - delete()
- * - exists()
- * - isFile()
- * - isDir()
- * - listFiles(…)
- * - length()
- * The following set of extension make sure that every call to those methods
- * is safeguarded to avoid crashing the customer's app.
- */
-
-@Suppress("TooGenericExceptionCaught", "SwallowedException")
-private fun <T> File.safeCall(
-    default: T,
-    lambda: File.() -> T
-): T {
-    return try {
-        lambda()
-    } catch (e: SecurityException) {
-        default
-    } catch (e: Exception) {
-        default
-    }
-}
-
-/**
- * Non-throwing version of [File.canRead]. If exception happens, false is returned.
- */
-
-fun File.canReadSafe(): Boolean {
-    return safeCall(default = false) {
-        @Suppress("UnsafeThirdPartyFunctionCall")
-        canRead()
-    }
-}
-
-/**
- * Non-throwing version of [File.exists]. If exception happens, false is returned.
- */
-
-fun File.existsSafe(): Boolean {
-    return safeCall(default = false) {
-        @Suppress("UnsafeThirdPartyFunctionCall")
-        exists()
-    }
-}
-
-/**
- * Non-throwing version of [File.readText]. If exception happens, null is returned.
- */
-
-fun File.readTextSafe(charset: Charset = Charsets.UTF_8): String? {
-    return if (existsSafe() && canReadSafe()) {
-        safeCall(default = null) {
-            @Suppress("UnsafeThirdPartyFunctionCall")
-            readText(charset)
-        }
-    } else {
-        null
-    }
-}
-
-/**
- * Non-throwing version of [File.readLines]. If exception happens, null is returned.
- */
-fun File.readLinesSafe(
-    charset: Charset = Charsets.UTF_8
-): List<String>? {
-    return if (existsSafe() && canReadSafe()) {
-        safeCall(default = null) {
-            @Suppress("UnsafeThirdPartyFunctionCall")
-            readLines(charset)
-        }
-    } else {
-        null
-    }
-}
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/DatadogMetricProfiler.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/internal/DatadogMetricProfiler.kt
deleted file mode 100644
index fd8818b16c..0000000000
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/DatadogMetricProfiler.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.benchmark.internal
-
-import android.view.Choreographer
-import com.datadog.benchmark.ext.canReadSafe
-import com.datadog.benchmark.ext.existsSafe
-import com.datadog.benchmark.ext.readLinesSafe
-import com.datadog.benchmark.ext.readTextSafe
-import java.io.File
-import java.util.concurrent.TimeUnit
-
-internal class DatadogMetricProfiler {
-
-    private var currentFps: Int = 0
-    private var frameCount = 0
-    private var lastFrameTime: Long = 0
-    private val intervalMs = FPS_SAMPLE_INTERVAL_IN_MS
-
-    private val statusFile = STATUS_FILE
-    private val statFile = STAT_FILE
-
-    private var lastCpuTicks = 0L
-
-    private val frameCallback = object : Choreographer.FrameCallback {
-        override fun doFrame(frameTimeNanos: Long) {
-            if (lastFrameTime == 0L) {
-                lastFrameTime = System.nanoTime()
-            }
-
-            frameCount++
-            val currentFrameTime = System.nanoTime()
-            val elapsedTime: Long = currentFrameTime - lastFrameTime
-
-            if (elapsedTime >= TimeUnit.MILLISECONDS.toNanos(intervalMs)) {
-                val fps: Double = frameCount / (elapsedTime / NANO_IN_SECOND)
-                currentFps = fps.toInt()
-                lastFrameTime = currentFrameTime
-                frameCount = 0
-            }
-            Choreographer.getInstance().postFrameCallback(this)
-        }
-    }
-
-    fun readMemoryVitalData(): Double? {
-        if (!(statusFile.existsSafe() && statusFile.canReadSafe())) {
-            return null
-        }
-
-        return statusFile.readLinesSafe()?.firstNotNullOfOrNull { line ->
-            VM_RSS_REGEX.matchEntire(line)?.groupValues?.getOrNull(1)
-        }?.toDoubleOrNull()?.div(KB_IN_MB)
-    }
-
-    @Suppress("ReturnCount")
-    fun readCpuVitalData(): Double? {
-        if (!(statFile.existsSafe() && statFile.canReadSafe())) {
-            return null
-        }
-
-        val stat = statFile.readTextSafe() ?: return null
-        val tokens = stat.split(' ')
-        val utime = if (tokens.size > UTIME_IDX) {
-            tokens[UTIME_IDX].toLong()
-        } else {
-            null
-        }
-        val cpuTicksDiff = utime?.let { it - lastCpuTicks }
-        lastCpuTicks = utime ?: 0L
-        return cpuTicksDiff?.toDouble()
-    }
-
-    fun getCurrentFps(): Int {
-        return currentFps
-    }
-
-    fun startFpsReader() {
-        Choreographer.getInstance().postFrameCallback(frameCallback)
-    }
-
-    fun stopFpsReader() {
-        Choreographer.getInstance().removeFrameCallback(frameCallback)
-    }
-
-    companion object {
-
-        private const val KB_IN_MB = 1000
-
-        private const val NANO_IN_SECOND = 1e9
-
-        private const val FPS_SAMPLE_INTERVAL_IN_MS = 30L
-
-        private const val STATUS_PATH = "/proc/self/status"
-        internal val STATUS_FILE = File(STATUS_PATH)
-
-        private const val STAT_PATH = "/proc/self/stat"
-        internal val STAT_FILE = File(STAT_PATH)
-        private const val VM_RSS_PATTERN = "VmRSS:\\s+(\\d+) kB"
-        private val VM_RSS_REGEX = Regex(VM_RSS_PATTERN)
-        private const val UTIME_IDX = 13
-    }
-}
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/CPUVitalReader.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/CPUVitalReader.kt
index 936bb68c30..e60e61675a 100644
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/CPUVitalReader.kt
+++ b/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/CPUVitalReader.kt
@@ -6,9 +6,6 @@
 
 package com.datadog.benchmark.internal.reader
 
-import com.datadog.benchmark.ext.canReadSafe
-import com.datadog.benchmark.ext.existsSafe
-import com.datadog.benchmark.ext.readTextSafe
 import java.io.File
 
 /**
@@ -23,11 +20,11 @@ internal class CPUVitalReader(
 
     @Suppress("ReturnCount")
     override fun readVitalData(): Double? {
-        if (!(statFile.existsSafe() && statFile.canReadSafe())) {
+        if (!(statFile.exists() && statFile.canRead())) {
             return null
         }
 
-        val stat = statFile.readTextSafe() ?: return null
+        val stat = statFile.readText()
         val tokens = stat.split(' ')
         val utime = if (tokens.size > UTIME_IDX) {
             tokens[UTIME_IDX].toLong()
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/MemoryVitalReader.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/MemoryVitalReader.kt
index 26042740bd..007e205c1a 100644
--- a/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/MemoryVitalReader.kt
+++ b/tools/benchmark/src/main/java/com/datadog/benchmark/internal/reader/MemoryVitalReader.kt
@@ -6,9 +6,6 @@
 
 package com.datadog.benchmark.internal.reader
 
-import com.datadog.benchmark.ext.canReadSafe
-import com.datadog.benchmark.ext.existsSafe
-import com.datadog.benchmark.ext.readLinesSafe
 import java.io.File
 
 /**
@@ -20,16 +17,13 @@ internal class MemoryVitalReader(
 ) : VitalReader {
 
     override fun readVitalData(): Double? {
-        if (!(statusFile.existsSafe() && statusFile.canReadSafe())) {
+        if (!(statusFile.exists() && statusFile.canRead())) {
             return null
         }
 
-        val memorySizeKb = statusFile.readLinesSafe()
-            ?.mapNotNull { line ->
-                VM_RSS_REGEX.matchEntire(line)?.groupValues?.getOrNull(1)
-            }
-            ?.firstOrNull()
-            ?.toDoubleOrNull()
+        val memorySizeKb = statusFile.readLines().firstNotNullOfOrNull { line ->
+            VM_RSS_REGEX.matchEntire(line)?.groupValues?.getOrNull(1)
+        }?.toDoubleOrNull()
 
         return if (memorySizeKb == null) {
             null