Merge branch 'master' into feat/in_app_prefix

Manoel Aranda Neto · Manoel Aranda Neto · commit 8dc891209724 · 2019-10-30T09:28:22.000+01:00
diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts
@@ -13,6 +13,7 @@ android {
     defaultConfig {
         targetSdkVersion(Config.Android.targetSdkVersion)
         minSdkVersion(Config.Android.minSdkVersion)
+
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
@@ -60,6 +61,7 @@ android {
             }, this))
         }
     }
+
     lintOptions {
         isWarningsAsErrors = true
         isCheckDependencies = true
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidSerializer.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidSerializer.java
@@ -7,6 +7,7 @@
 import io.sentry.core.ILogger;
 import io.sentry.core.ISerializer;
 import io.sentry.core.SentryEvent;
+import io.sentry.core.SentryLevel;
 import io.sentry.core.protocol.Device;
 import io.sentry.core.protocol.SentryId;
 import java.io.IOException;
@@ -38,6 +39,8 @@ private Gson provideGson() {
             Device.DeviceOrientation.class, new OrientationSerializerAdapter(logger))
         .registerTypeAdapter(
             Device.DeviceOrientation.class, new OrientationDeserializerAdapter(logger))
+        .registerTypeAdapter(SentryLevel.class, new SentryLevelSerializerAdapter(logger))
+        .registerTypeAdapter(SentryLevel.class, new SentryLevelDeserializerAdapter(logger))
         .registerTypeAdapterFactory(UnknownPropertiesTypeAdapterFactory.get())
         .create();
   }
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java
@@ -157,6 +157,8 @@ private Long getMemorySize(ActivityManager.MemoryInfo memInfo) {
   // we can get some inspiration here
   // https://github.com/flutter/plugins/blob/master/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
   private Device getDevice() {
+    // TODO: missing name and usable memory
+
     Device device = new Device();
     device.setManufacturer(Build.MANUFACTURER);
     device.setBrand(Build.BRAND);
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/adapters/SentryLevelDeserializerAdapter.java b/sentry-android-core/src/main/java/io/sentry/android/core/adapters/SentryLevelDeserializerAdapter.java
@@ -0,0 +1,32 @@
+package io.sentry.android.core.adapters;
+
+import static io.sentry.core.ILogger.log;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import io.sentry.core.ILogger;
+import io.sentry.core.SentryLevel;
+import java.lang.reflect.Type;
+import java.util.Locale;
+
+public class SentryLevelDeserializerAdapter implements JsonDeserializer<SentryLevel> {
+
+  private final ILogger logger;
+
+  public SentryLevelDeserializerAdapter(ILogger logger) {
+    this.logger = logger;
+  }
+
+  @Override
+  public SentryLevel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+      throws JsonParseException {
+    try {
+      return json == null ? null : SentryLevel.valueOf(json.getAsString().toUpperCase(Locale.ROOT));
+    } catch (Exception e) {
+      log(logger, SentryLevel.ERROR, "Error when deserializing SentryLevel", e);
+    }
+    return null;
+  }
+}
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/adapters/SentryLevelSerializerAdapter.java b/sentry-android-core/src/main/java/io/sentry/android/core/adapters/SentryLevelSerializerAdapter.java
@@ -0,0 +1,31 @@
+package io.sentry.android.core.adapters;
+
+import static io.sentry.core.ILogger.log;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import io.sentry.core.ILogger;
+import io.sentry.core.SentryLevel;
+import java.lang.reflect.Type;
+import java.util.Locale;
+
+public class SentryLevelSerializerAdapter implements JsonSerializer<SentryLevel> {
+
+  private final ILogger logger;
+
+  public SentryLevelSerializerAdapter(ILogger logger) {
+    this.logger = logger;
+  }
+
+  @Override
+  public JsonElement serialize(SentryLevel src, Type typeOfSrc, JsonSerializationContext context) {
+    try {
+      return src == null ? null : new JsonPrimitive(src.name().toLowerCase(Locale.ROOT));
+    } catch (Exception e) {
+      log(logger, SentryLevel.ERROR, "Error when serializing SentryLevel", e);
+    }
+    return null;
+  }
+}
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidSerializerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidSerializerTest.kt
@@ -6,6 +6,7 @@ import com.google.gson.internal.LinkedTreeMap
 import com.nhaarman.mockitokotlin2.mock
 import io.sentry.core.DateUtils
 import io.sentry.core.SentryEvent
+import io.sentry.core.SentryLevel
 import io.sentry.core.protocol.Contexts
 import io.sentry.core.protocol.Device
 import java.io.StringWriter
@@ -200,6 +201,33 @@ class AndroidSerializerTest {
         assertEquals(Device.DeviceOrientation.LANDSCAPE, Device.DeviceOrientation.valueOf(orientation.toUpperCase())) // here too
     }
 
+    @Test
+    fun `when serializing a SentryLevel, it should become a sentry level string`() {
+        val sentryEvent = generateEmptySentryEvent()
+        sentryEvent.eventId = null
+        sentryEvent.timestamp = null
+        sentryEvent.level = SentryLevel.DEBUG
+
+        val expected = "{\"level\":\"debug\"}"
+
+        val actual = serializeToString(sentryEvent)
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `when deserializing a sentry level string, it should become a SentryLevel`() {
+        val sentryEvent = generateEmptySentryEvent()
+        sentryEvent.eventId = null
+        sentryEvent.timestamp = null
+
+        val jsonEvent = "{\"level\":\"debug\"}"
+
+        val actual = serializer.deserializeEvent(jsonEvent)
+
+        assertEquals(SentryLevel.DEBUG, actual.level)
+    }
+
     private fun generateEmptySentryEvent(): SentryEvent {
         return SentryEvent().apply {
             contexts = null
diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts
@@ -1,24 +1,28 @@
 
 plugins {
     id("com.android.library")
+    kotlin("android")
+    jacoco
 }
 
 android {
     compileSdkVersion(Config.Android.compileSdkVersion)
     buildToolsVersion(Config.Android.buildToolsVersion)
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
+
     defaultConfig {
         targetSdkVersion(Config.Android.targetSdkVersion)
+        minSdkVersion(Config.Android.minSdkVersionNdk)
+
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath = true
             }
         }
 
-        minSdkVersion(Config.Android.minSdkVersionNdk)
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        versionName = "$version"
+
         externalNativeBuild {
             val sentryNativeSrc = if (File("${project.projectDir}/sentry-native-local").exists()) {
                 "sentry-native-local"
@@ -28,9 +32,10 @@ android {
             cmake {
                 arguments.add(0, "-DANDROID_STL=c++_static")
                 arguments.add(0, "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON")
-                arguments.add(0, "-DSENTRY_NATIVE_SRC=" + sentryNativeSrc)
+                arguments.add(0, "-DSENTRY_NATIVE_SRC=$sentryNativeSrc")
             }
         }
+
         ndk {
             val platform = System.getenv("ABI")
             if (platform == null || platform.toLowerCase() == "all") {
@@ -40,14 +45,64 @@ android {
             }
         }
 
-        missingDimensionStrategy(Config.Flavors.dimension, Config.Flavors.production)
+        // replace with https://issuetracker.google.com/issues/72050365 once released.
+        libraryVariants.all {
+            generateBuildConfigProvider?.configure {
+                enabled = false
+            }
+        }
     }
 
     externalNativeBuild {
         cmake {
             setPath("CMakeLists.txt")
         }
     }
+
+    buildTypes {
+        getByName("debug")
+        getByName("release") {
+            consumerProguardFiles("proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    // due https://github.com/gradle/gradle/issues/11083
+//    kotlinOptions {
+//        jvmTarget = JavaVersion.VERSION_1_8.toString()
+//    }
+    withGroovyBuilder {
+        "kotlinOptions" {
+            setProperty("jvmTarget", JavaVersion.VERSION_1_8.toString())
+        }
+    }
+
+    testOptions {
+        animationsDisabled = true
+        unitTests.apply {
+            isReturnDefaultValues = true
+            isIncludeAndroidResources = true
+            all(KotlinClosure1<Any, Test>({
+                (this as Test).also { testTask ->
+                    testTask.extensions
+                        .getByType(JacocoTaskExtension::class.java)
+                        .isIncludeNoLocationClasses = true
+                }
+            }, this))
+        }
+    }
+
+    lintOptions {
+        isWarningsAsErrors = true
+        isCheckDependencies = true
+
+        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
+        isCheckReleaseBuilds = false
+    }
 }
 
 dependencies {
diff --git a/sentry-android-ndk/proguard-rules.pro b/sentry-android-ndk/proguard-rules.pro
@@ -0,0 +1 @@
+# how to set proguard rules for ndk https://proandroiddev.com/debugging-native-crashes-in-android-apps-2b86fd7113d8
diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts
@@ -9,6 +9,8 @@ android {
     defaultConfig {
         targetSdkVersion(Config.Android.targetSdkVersion)
         minSdkVersion(Config.Android.minSdkVersionNdk)
+
+        versionName = "$version"
     }
 
     compileOptions {
diff --git a/sentry-core/src/main/java/io/sentry/core/Sentry.java b/sentry-core/src/main/java/io/sentry/core/Sentry.java
@@ -74,35 +74,35 @@ public static SentryId captureException(Throwable throwable) {
     return getCurrentHub().captureException(throwable);
   }
 
-  public void addBreadcrumb(Breadcrumb breadcrumb) {
+  public static void addBreadcrumb(Breadcrumb breadcrumb) {
     getCurrentHub().addBreadcrumb(breadcrumb);
   }
 
-  public SentryId getLastEventId() {
+  public static SentryId getLastEventId() {
     return getCurrentHub().getLastEventId();
   }
 
-  public void pushScope() {
+  public static void pushScope() {
     getCurrentHub().pushScope();
   }
 
-  public void popScope() {
+  public static void popScope() {
     getCurrentHub().popScope();
   }
 
-  public void withScope(ScopeCallback callback) {
+  public static void withScope(ScopeCallback callback) {
     getCurrentHub().withScope(callback);
   }
 
-  public void configureScope(ScopeCallback callback) {
+  public static void configureScope(ScopeCallback callback) {
     getCurrentHub().configureScope(callback);
   }
 
-  public void bindClient(SentryClient client) {
+  public static void bindClient(SentryClient client) {
     getCurrentHub().bindClient(client);
   }
 
-  public void flush(int timeoutMills) {
+  public static void flush(int timeoutMills) {
     getCurrentHub().flush(timeoutMills);
   }
 
diff --git a/sentry-core/src/main/java/io/sentry/core/protocol/Contexts.java b/sentry-core/src/main/java/io/sentry/core/protocol/Contexts.java
@@ -39,7 +39,7 @@ public OperatingSystem getOperatingSystem() {
   }
 
   public void setOperatingSystem(OperatingSystem operatingSystem) {
-    this.put(Device.TYPE, operatingSystem);
+    this.put(OperatingSystem.TYPE, operatingSystem);
   }
 
   public Runtime getRuntime() {
diff --git a/sentry-sample/src/main/java/io/sentry/sample/MainActivity.java b/sentry-sample/src/main/java/io/sentry/sample/MainActivity.java
@@ -1,14 +1,22 @@
 package io.sentry.sample;
 
 import android.os.Bundle;
+import android.os.StrictMode;
 import androidx.appcompat.app.AppCompatActivity;
+import io.sentry.core.Breadcrumb;
 import io.sentry.core.Sentry;
+import io.sentry.core.SentryLevel;
+import io.sentry.core.protocol.User;
+import java.util.Collections;
 import timber.log.Timber;
 
 public class MainActivity extends AppCompatActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
+    // ideally Application class
+    districtMode();
+
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
 
@@ -33,5 +41,37 @@ protected void onCreate(Bundle savedInstanceState) {
             view -> {
               Sentry.captureException(new Exception("Some exception."));
             });
+
+    findViewById(R.id.breadcrumb)
+        .setOnClickListener(
+            view -> {
+              Sentry.configureScope(
+                  scope -> {
+                    Breadcrumb breadcrumb = new Breadcrumb();
+                    breadcrumb.setMessage("Breadcrumb");
+                    scope.addBreadcrumb(breadcrumb);
+                    scope.setExtra("extra", "extra");
+                    scope.setFingerprint(Collections.singletonList("fingerprint"));
+                    scope.setLevel(SentryLevel.INFO);
+                    scope.setTransaction("transaction");
+                    User user = new User();
+                    user.setUsername("username");
+                    scope.setUser(user);
+                    scope.setTag("tag", "tag");
+                  });
+            });
+  }
+
+  private void districtMode() {
+    //    https://developer.android.com/reference/android/os/StrictMode
+    //    StrictMode is a developer tool which detects things you might be doing by accident and
+    // brings them to your attention so you can fix them.
+
+    if (BuildConfig.DEBUG) {
+      StrictMode.setThreadPolicy(
+          new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
+
+      StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build());
+    }
   }
 }
diff --git a/sentry-sample/src/main/res/layout/activity_main.xml b/sentry-sample/src/main/res/layout/activity_main.xml
@@ -20,4 +20,9 @@
           android:layout_height="wrap_content"
           android:id="@+id/capture_exception"
           android:text="@string/capture_exception"/>
+
+  <Button android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/breadcrumb"
+          android:text="@string/breadcrumb"/>
 </LinearLayout>
diff --git a/sentry-sample/src/main/res/values/strings.xml b/sentry-sample/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# how to set proguard rules for ndk https://proandroiddev.com/debugging-native-crashes-in-android-apps-2b86fd7113d8`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ android {`
`9`	`9`	`defaultConfig {`
`10`	`10`	`targetSdkVersion(Config.Android.targetSdkVersion)`
`11`	`11`	`minSdkVersion(Config.Android.minSdkVersionNdk)`
	`12`	`+`
	`13`	`+ versionName = "$version"`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -74,35 +74,35 @@ public static SentryId captureException(Throwable throwable) {`
`74`	`74`	`return getCurrentHub().captureException(throwable);`
`75`	`75`	`}`
`76`	`76`
`77`		`- public void addBreadcrumb(Breadcrumb breadcrumb) {`
	`77`	`+ public static void addBreadcrumb(Breadcrumb breadcrumb) {`
`78`	`78`	`getCurrentHub().addBreadcrumb(breadcrumb);`
`79`	`79`	`}`
`80`	`80`
`81`		`- public SentryId getLastEventId() {`
	`81`	`+ public static SentryId getLastEventId() {`
`82`	`82`	`return getCurrentHub().getLastEventId();`
`83`	`83`	`}`
`84`	`84`
`85`		`- public void pushScope() {`
	`85`	`+ public static void pushScope() {`
`86`	`86`	`getCurrentHub().pushScope();`
`87`	`87`	`}`
`88`	`88`
`89`		`- public void popScope() {`
	`89`	`+ public static void popScope() {`
`90`	`90`	`getCurrentHub().popScope();`
`91`	`91`	`}`
`92`	`92`
`93`		`- public void withScope(ScopeCallback callback) {`
	`93`	`+ public static void withScope(ScopeCallback callback) {`
`94`	`94`	`getCurrentHub().withScope(callback);`
`95`	`95`	`}`
`96`	`96`
`97`		`- public void configureScope(ScopeCallback callback) {`
	`97`	`+ public static void configureScope(ScopeCallback callback) {`
`98`	`98`	`getCurrentHub().configureScope(callback);`
`99`	`99`	`}`
`100`	`100`
`101`		`- public void bindClient(SentryClient client) {`
	`101`	`+ public static void bindClient(SentryClient client) {`
`102`	`102`	`getCurrentHub().bindClient(client);`
`103`	`103`	`}`
`104`	`104`
`105`		`- public void flush(int timeoutMills) {`
	`105`	`+ public static void flush(int timeoutMills) {`
`106`	`106`	`getCurrentHub().flush(timeoutMills);`
`107`	`107`	`}`
`108`	`108`