Send error

DataDog · Jan 4, 2024 · d80f245 · d80f245
1 parent 563cf3b
commit d80f245
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,6 +26,7 @@ allprojects {
         google()
         mavenCentral()
         maven { setUrl(com.datadog.gradle.Dependencies.Repositories.Jitpack) }
+        mavenLocal()
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ versionsPluginGradle = "0.33.0"
 kotlinGrammarParser = "c35b50fa44"
 
 # Datadog
-datadogSdk = "2.3.0"
+datadogSdk = "2.4.0"
 datadogPluginGradle = "1.12.0"
 
 [libraries]
@@ -94,6 +94,7 @@ fuzzyWuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzyWuzzy" }
 
 # Datadog
 datadogSdkRum = { module = "com.datadoghq:dd-sdk-android-rum", version.ref = "datadogSdk" }
+datadogSdkLogs = { module = "com.datadoghq:dd-sdk-android-logs", version.ref = "datadogSdk" }
 datadogPluginGradle = { module = "com.datadoghq:dd-sdk-android-gradle-plugin", version.ref = "datadogPluginGradle" }
 
 [bundles]

diff --git a/samples/variants/build.gradle b/samples/variants/build.gradle
@@ -18,10 +18,15 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
 
@@ -78,23 +83,10 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.constraintlayout)
 
-    // implementation(libs.datadogSdkRum)
+    implementation(libs.datadogSdkRum)
+    implementation(libs.datadogSdkLogs)
 }
 
-//datadog {
-//    site = "US"
-//    checkProjectDependencies = "fail"
-//    mappingFilePath = "path/to/mapping.txt"
-//    variants {
-//        demo {
-//            versionName = "demo"
-//        }
-//        full {
-//            versionName = "full"
-//        }
-//        pro {
-//            site = "GOV"
-//            versionName = "pro"
-//        }
-//    }
-//}
+datadog {
+    site = "STAGING"
+}
diff --git a/samples/variants/src/main/AndroidManifest.xml b/samples/variants/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name=".VariantsApplication">
         <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

diff --git a/samples/variants/src/main/java/com/datadog/example/variants/MainActivity.kt b/samples/variants/src/main/java/com/datadog/example/variants/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.datadog.example.variants
 
 import android.os.Bundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import com.datadog.example.variants.ext.toast
 
@@ -14,6 +15,9 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        findViewById<Button>(R.id.send_crash).setOnClickListener {
+            throw RuntimeException("Testing buildId logic")
+        }
     }
 
     override fun onResume() {

diff --git a/samples/variants/src/main/java/com/datadog/example/variants/VariantsApplication.kt b/samples/variants/src/main/java/com/datadog/example/variants/VariantsApplication.kt
@@ -0,0 +1,31 @@
+package com.datadog.example.variants
+
+import android.app.Application
+import android.util.Log
+import com.datadog.android.Datadog
+import com.datadog.android.DatadogSite
+import com.datadog.android.core.configuration.Configuration
+import com.datadog.android.log.Logs
+import com.datadog.android.log.LogsConfiguration
+import com.datadog.android.privacy.TrackingConsent
+import com.datadog.android.rum.Rum
+import com.datadog.android.rum.RumConfiguration
+
+class VariantsApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        Datadog.setVerbosity(Log.DEBUG)
+        Datadog.initialize(
+            this, Configuration.Builder(
+                clientToken = "",
+                env = "prod",
+                variant = BuildConfig.FLAVOR
+            )
+                .useSite(DatadogSite.STAGING)
+                .build(),
+            TrackingConsent.GRANTED
+        )
+        Logs.enable(LogsConfiguration.Builder().build())
+        Rum.enable(RumConfiguration.Builder(applicationId = "").build())
+    }
+}
diff --git a/samples/variants/src/main/res/layout/activity_main.xml b/samples/variants/src/main/res/layout/activity_main.xml
@@ -13,10 +13,11 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
+    <Button
+        android:id="@+id/send_crash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:text="Send crash"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"