sentry-java v-next

.github/workflows/android.yml

@@ -44,13 +44,13 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.gradle/caches/
-          key: cache-gradle-cache-2
+          key: cache-gradle-cache-3
 
       - name: Cache Gradle Wrapper
         uses: actions/cache@v1
         with:
           path: ~/.gradle/wrapper/
-          key: cache-gradle-wrapper-2
+          key: cache-gradle-wrapper-3
 
       # uses eskatos/gradle-command-action, so we don't care for ./gradlew or gradlew.bat
 

README.md

@@ -5,25 +5,36 @@
   <br />
 </p>
 
-Sentry SDK for Android
+Sentry SDK for Java and Android
 ===========
-[![Travis](https://img.shields.io/travis/getsentry/sentry-android?label=Travis)](https://travis-ci.com/getsentry/sentry-android)
-[![AppVeyor](https://img.shields.io/appveyor/build/sentry/sentry-android?label=AppVeyor)](https://ci.appveyor.com/project/sentry/sentry-android/branch/master)
-[![GH Workflow](https://img.shields.io/github/workflow/status/getsentry/sentry-android/Workflow%20Ubuntu%20macOS?label=GH%20Workflow)](https://github.com/getsentry/sentry-android/actions)
-[![Tests](https://img.shields.io/appveyor/tests/sentry/sentry-android/master?compact_message)](https://ci.appveyor.com/project/sentry/sentry-android/branch/master/tests)
-[![codecov](https://codecov.io/gh/getsentry/sentry-android/branch/master/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-android)
-[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/getsentry/sentry-android.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/getsentry/sentry-android/context:java)
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/getsentry/sentry-android.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/getsentry/sentry-android/alerts/)
+[![Travis](https://img.shields.io/travis/getsentry/sentry-java/ref/sentry-java-2?label=Travis)](https://travis-ci.com/getsentry/sentry-java)
+[![AppVeyor](https://img.shields.io/appveyor/build/sentry/sentry-java?label=AppVeyor)](https://ci.appveyor.com/project/sentry/sentry-java)
+[![GH Workflow](https://img.shields.io/github/workflow/status/getsentry/sentry-java/Workflow%20Ubuntu%20macOS?label=GH%20Workflow)](https://github.com/getsentry/sentry-java/actions)
+[![Tests](https://img.shields.io/appveyor/tests/sentry/sentry-java/ref/sentry-java-2?compact_message)](https://ci.appveyor.com/project/sentry/sentry-java/branch/ref/sentry-java-2/tests)
+[![codecov](https://codecov.io/gh/getsentry/sentry-java/branch/ref/sentry-java-2/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-java)
+[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/getsentry/sentry-java.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/getsentry/sentry-java/context:java)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/getsentry/sentry-java/ref/sentry-java-2.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/getsentry/sentry-java/alerts/)
 
 |      Packages          | bintray | API |
 | ---------------------- | ------- | ------- |
 | sentry-android | [![sentry-android](https://img.shields.io/bintray/v/getsentry/sentry-android/io.sentry:sentry-android)](https://bintray.com/getsentry/sentry-android/io.sentry:sentry-android?tab=overview) | 16 |
 | sentry-android-core | [![sentry-android-core](https://img.shields.io/bintray/v/getsentry/sentry-android/io.sentry:sentry-android-core)](https://bintray.com/getsentry/sentry-android/io.sentry:sentry-android-core?tab=overview) | 14 |
 | sentry-android-ndk | [![sentry-android-ndk](https://img.shields.io/bintray/v/getsentry/sentry-android/io.sentry:sentry-android-ndk)](https://bintray.com/getsentry/sentry-android/io.sentry:sentry-android-ndk?tab=overview) | 16 |
 | sentry-android-timber | [![sentry-android-timber](https://img.shields.io/bintray/v/getsentry/sentry-android/io.sentry:sentry-android-timber)](https://bintray.com/getsentry/sentry-android/io.sentry:sentry-android-timber?tab=overview) | 14 |
-| sentry-core | [![sentry-core](https://img.shields.io/bintray/v/getsentry/sentry-android/io.sentry:sentry-core)](https://bintray.com/getsentry/sentry-android/io.sentry:sentry-core?tab=overview) | 14 |
+| sentry | [![sentry](https://img.shields.io/bintray/v/getsentry/sentry-java/io.sentry:sentry)](https://bintray.com/getsentry/sentry-java/io.sentry:sentry?tab=overview) | 14 |
+| sentry-spring-boot-starter | [![sentry-spring-boot-starter](https://img.shields.io/bintray/v/getsentry/sentry-java/io.sentry:sentry-spring-boot-starter)](https://bintray.com/getsentry/sentry-java/io.sentry:sentry-spring-boot-starter?tab=overview) | |
+| sentry-spring | [![sentry-spring](https://img.shields.io/bintray/v/getsentry/sentry-java/io.sentry:sentry-spring)](https://bintray.com/getsentry/sentry-java/io.sentry:sentry-spring?tab=overview) | |
+| sentry-log4j | [![sentry-log4j](https://img.shields.io/bintray/v/getsentry/sentry-java/io.sentry:sentry-log4j)](https://bintray.com/getsentry/sentry-java/io.sentry:sentry-log4j?tab=overview) | |
+| sentry-log4j2 | [![sentry-log4j2](https://img.shields.io/bintray/v/getsentry/sentry-java/io.sentry:sentry-log4j2)](https://bintray.com/getsentry/sentry-java/io.sentry:sentry-log4j2?tab=overview) | |
 
-# Docs
+
+# Java SDK 2.0 Docs
+
+The Java SDK documentation [can be found on docs.sentry.io](https://docs.sentry.io/platforms/java/).
+
+Java SDK version 1.x [can still be found here](https://docs.sentry.io/clients/java/).
+
+# Android Docs
 
 That's the initial page of the release [2.x and its docs](https://docs.sentry.io/platforms/android).
 
@@ -54,7 +65,8 @@ This directory is also included in `.gitignore` not to be shown as pending chang
 
 # Resources
 
-* [![Documentation](https://img.shields.io/badge/documentation-sentry.io-green.svg)](https://docs.sentry.io/platforms/android/)
+* [![Java Documentation](https://img.shields.io/badge/documentation-sentry.io-green.svg)](https://docs.sentry.io/platforms/java/)
+* [![Android Documentation](https://img.shields.io/badge/documentation-sentry.io-green.svg)](https://docs.sentry.io/platforms/android/)
 * [![Forum](https://img.shields.io/badge/forum-sentry-green.svg)](https://forum.sentry.io/c/sdks)
 * [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/Ww9hbqr)
 * [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-sentry-green.svg)](http://stackoverflow.com/questions/tagged/sentry)

build.gradle.kts

@@ -51,7 +51,7 @@ allprojects {
             dependsOn("cleanTest")
         }
         withType<JavaCompile> {
-            options.compilerArgs.addAll(arrayOf("-Xlint:all", "-Werror", "-Xlint:-classfile"))
+            options.compilerArgs.addAll(arrayOf("-Xlint:all", "-Werror", "-Xlint:-classfile", "-Xlint:-processing"))
         }
     }
 }
@@ -65,10 +65,11 @@ spotless {
     }
 
     kotlin {
-        ktlint()
         target("**/*.kt")
+        ktlint()
     }
     kotlinGradle {
+        target("**/*.kts")
         ktlint()
     }
 }

buildSrc/src/main/java/Config.kt

@@ -1,12 +1,21 @@
+import java.math.BigDecimal
+
 object Config {
     val kotlinVersion = "1.4.0"
     val kotlinStdLib = "stdlib-jdk8"
 
+    val springBootVersion = "2.3.3.RELEASE"
+    // Spring is currently not compatible with Kotlin 1.4
+    val springKotlinCompatibleLanguageVersion = "1.3"
+
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:4.0.1"
         val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
         val buildConfigVersion = "2.0.2"
+        val springBoot = "org.springframework.boot"
+        val springDependencyManagement = "io.spring.dependency-management"
+        val springDependencyManagementVersion = "1.0.10.RELEASE"
     }
 
     object Android {
@@ -32,6 +41,26 @@ object Config {
         private val lifecycleVersion = "2.2.0"
         val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
         val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
+
+        val logbackVersion = "1.2.3"
+        val logbackClassic = "ch.qos.logback:logback-classic:$logbackVersion"
+
+        val log4j2Version = "2.13.3"
+        val log4j2Api = "org.apache.logging.log4j:log4j-api:$log4j2Version"
+        val log4j2Core = "org.apache.logging.log4j:log4j-core:$log4j2Version"
+
+        val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
+        val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
+        val springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
+        val springBootStarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBootVersion"
+
+        val springWeb = "org.springframework:spring-webmvc"
+        val servletApi = "javax.servlet:javax.servlet-api"
+    }
+
+    object AnnotationProcessors {
+        val springBootAutoConfigure = "org.springframework.boot:spring-boot-autoconfigure-processor"
+        val springBootConfiguration = "org.springframework.boot:spring-boot-configuration-processor"
     }
 
     object TestLibs {
@@ -48,7 +77,10 @@ object Config {
     }
 
     object QualityPlugins {
-        val jacocoVersion = "0.8.5"
+        object Jacoco {
+            val version = "0.8.5"
+            val minimumCoverage = BigDecimal.valueOf(0.6)
+        }
         val spotless = "com.diffplug.spotless"
         val spotlessVersion = "5.3.0"
         val errorProne = "net.ltgt.errorprone"
@@ -63,6 +95,10 @@ object Config {
     object Sentry {
         val SENTRY_JAVA_SDK_NAME = "sentry.java"
         val SENTRY_ANDROID_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.android"
+        val SENTRY_LOGBACK_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.logback"
+        val SENTRY_LOG4J2_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.log4j2"
+        val SENTRY_SPRING_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring"
+        val SENTRY_SPRING_BOOT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot"
         val group = "io.sentry"
         val description = "SDK for sentry.io"
         val website = "https://sentry.io"

gradle.properties

@@ -8,8 +8,8 @@ org.gradle.caching=true
 android.useAndroidX=true
 
 # Release information
-buildVersionCode=20038
-versionName=2.3.2-SNAPSHOT
+buildVersionCode=20039
+versionName=3.0.0-alpha.2-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false
@@ -23,6 +23,9 @@ android.defaults.buildfeatures.aidl=false
 # disable Resource Values generation
 android.defaults.buildfeatures.resvalues=false
 
+# disable automatically adding Kotlin stdlib to compile dependencies
+kotlin.stdlib.default.dependency=false
+
 # TODO: Enable Prefab https://android-developers.googleblog.com/2020/02/native-dependencies-in-android-studio-40.html
 # android.enablePrefab=true
 # android.prefabVersion=1.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

sentry-android-core/build.gradle.kts

@@ -72,7 +72,7 @@ android {
 }
 
 dependencies {
-    api(project(":sentry-core"))
+    api(project(":sentry"))
 
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)
@@ -96,7 +96,7 @@ dependencies {
     testImplementation(Config.TestLibs.awaitility)
 }
 
-//TODO: move thse blocks to parent gradle file, DRY
+// TODO: move thse blocks to parent gradle file, DRY
 configure<PublishExtension> {
     userOrg = Config.Sentry.userOrg
     groupId = project.group.toString()
@@ -116,5 +116,5 @@ configure<PublishExtension> {
     devEmail = Config.Sentry.devEmail
     scmConnection = Config.Sentry.scmConnection
     scmDevConnection = Config.Sentry.scmDevConnection
-    scmUrl  = Config.Sentry.scmUrl
+    scmUrl = Config.Sentry.scmUrl
 }

sentry-android-core/proguard-rules.pro

@@ -11,7 +11,7 @@
 -keep class com.google.gson.** { *; }
 
 # Application classes that will be serialized/deserialized over Gson
--keep class io.sentry.core.** { *; }
+-keep class io.sentry.** { *; }
 -keepclassmembers enum * { *; }
 -keep class io.sentry.android.core.** { *; }
 

sentry-android-core/src/main/java/io/sentry/android/core/ANRWatchDog.java

@@ -7,8 +7,8 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Debug;
-import io.sentry.core.ILogger;
-import io.sentry.core.SentryLevel;
+import io.sentry.ILogger;
+import io.sentry.SentryLevel;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;

sentry-android-core/src/main/java/io/sentry/android/core/ActivityBreadcrumbsIntegration.java

@@ -5,12 +5,12 @@
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.sentry.core.Breadcrumb;
-import io.sentry.core.IHub;
-import io.sentry.core.Integration;
-import io.sentry.core.SentryLevel;
-import io.sentry.core.SentryOptions;
-import io.sentry.core.util.Objects;
+import io.sentry.Breadcrumb;
+import io.sentry.IHub;
+import io.sentry.Integration;
+import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
+import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
 import org.jetbrains.annotations.NotNull;

sentry-android-core/src/main/java/io/sentry/android/core/AndroidLogger.java

@@ -1,8 +1,8 @@
 package io.sentry.android.core;
 
 import android.util.Log;
-import io.sentry.core.ILogger;
-import io.sentry.core.SentryLevel;
+import io.sentry.ILogger;
+import io.sentry.SentryLevel;
 
 final class AndroidLogger implements ILogger {
 

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -6,13 +6,13 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.os.Build;
-import io.sentry.core.ILogger;
-import io.sentry.core.SendCachedEventFireAndForgetIntegration;
-import io.sentry.core.SendFireAndForgetEnvelopeSender;
-import io.sentry.core.SendFireAndForgetEventSender;
-import io.sentry.core.SentryLevel;
-import io.sentry.core.SentryOptions;
-import io.sentry.core.util.Objects;
+import io.sentry.ILogger;
+import io.sentry.SendCachedEnvelopeFireAndForgetIntegration;
+import io.sentry.SendFireAndForgetEnvelopeSender;
+import io.sentry.SendFireAndForgetOutboxSender;
+import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
+import io.sentry.util.Objects;
 import java.io.File;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -116,28 +116,24 @@ private static void installDefaultIntegrations(
       final @NotNull ILoadClass loadClass) {
 
     options.addIntegration(
-        new SendCachedEventFireAndForgetIntegration(
-            new SendFireAndForgetEventSender(() -> options.getCacheDirPath())));
-
-    options.addIntegration(
-        new SendCachedEventFireAndForgetIntegration(
-            new SendFireAndForgetEnvelopeSender(() -> options.getSessionsPath())));
+        new SendCachedEnvelopeFireAndForgetIntegration(
+            new SendFireAndForgetEnvelopeSender(() -> options.getCacheDirPath())));
 
     // Integrations are registered in the same order. NDK before adding Watch outbox,
     // because sentry-native move files around and we don't want to watch that.
     final Class<?> sentryNdkClass = loadNdkIfAvailable(options, buildInfoProvider, loadClass);
     options.addIntegration(new NdkIntegration(sentryNdkClass));
 
-    // this integration uses android.os.FileObserver, we can't move to sentry-core
+    // this integration uses android.os.FileObserver, we can't move to sentry
     // before creating a pure java impl.
     options.addIntegration(EnvelopeFileObserverIntegration.getOutboxFileObserver());
 
     // Send cached envelopes from outbox path
     // this should be executed after NdkIntegration because sentry-native move files on init.
     // and we'd like to send them right away
     options.addIntegration(
-        new SendCachedEventFireAndForgetIntegration(
-            new SendFireAndForgetEnvelopeSender(() -> options.getOutboxPath())));
+        new SendCachedEnvelopeFireAndForgetIntegration(
+            new SendFireAndForgetOutboxSender(() -> options.getOutboxPath())));
 
     options.addIntegration(new AnrIntegration(context));
     options.addIntegration(new AppLifecycleIntegration());

sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransportGate.java

@@ -1,9 +1,9 @@
 package io.sentry.android.core;
 
 import android.content.Context;
+import io.sentry.ILogger;
 import io.sentry.android.core.util.ConnectivityChecker;
-import io.sentry.core.ILogger;
-import io.sentry.core.transport.ITransportGate;
+import io.sentry.transport.ITransportGate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;