Merge branch '126-fix-npe-bug-due-to-upgraded-version-of-sentry-clien…

…t' into 'develop' Resolve "Fix NPE bug due to upgraded version of sentry client" Closes #126 See merge request hercules/hercules!149
vostok · Sep 25, 2019 · 3ed8597 · 3ed8597
2 parents 62097fb + f70d59e
commit 3ed8597
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.../main/java/ru/kontur/vostok/hercules/sentry/sink/converters/SentryExceptionConverter.java b/.../main/java/ru/kontur/vostok/hercules/sentry/sink/converters/SentryExceptionConverter.java
@@ -3,6 +3,7 @@
 import io.sentry.event.interfaces.SentryException;
 import io.sentry.event.interfaces.SentryStackTraceElement;
 import io.sentry.event.interfaces.StackTraceInterface;
+import org.jetbrains.annotations.NotNull;
 import ru.kontur.vostok.hercules.protocol.Container;
 import ru.kontur.vostok.hercules.tags.ExceptionTags;
 import ru.kontur.vostok.hercules.protocol.util.ContainerUtil;
@@ -32,7 +33,7 @@ public static SentryException convert(final Container container) {
         final Optional<ClassPackagePair> classPackagePair = ContainerUtil.extract(container, ExceptionTags.TYPE_TAG)
                 .map(SentryExceptionConverter::extractClassPackagePair);
 
-        final String className = classPackagePair.map(ClassPackagePair::getClassName).orElse(null);
+        final String className = classPackagePair.map(ClassPackagePair::getClassName).orElse("");
         final String packageName = classPackagePair.map(ClassPackagePair::getPackageName).orElse(null);
 
         final StackTraceInterface stacktrace = ContainerUtil.extract(container, ExceptionTags.STACK_FRAMES)
@@ -51,7 +52,7 @@ public static SentryException convert(final Container container) {
         );
     }
 
-    private static ClassPackagePair extractClassPackagePair(final String typeName) {
+    private static ClassPackagePair extractClassPackagePair(final @NotNull String typeName) {
         final int finalDot = typeName.lastIndexOf('.');
 
         if (finalDot != NOT_FOUND) {
@@ -65,7 +66,7 @@ private static class ClassPackagePair {
         private final String packageName;
         private final String className;
 
-        public ClassPackagePair(String packageName, String className) {
+        private ClassPackagePair(String packageName, @NotNull String className) {
             this.packageName = packageName;
             this.className = className;
         }
@@ -74,6 +75,7 @@ public String getPackageName() {
             return packageName;
         }
 
+        @NotNull
         public String getClassName() {
             return className;
         }

diff --git a/...va/ru/kontur/vostok/hercules/sentry/sink/converters/SentryStackTraceElementConverter.java b/...va/ru/kontur/vostok/hercules/sentry/sink/converters/SentryStackTraceElementConverter.java
@@ -19,11 +19,11 @@ public class SentryStackTraceElementConverter {
      */
     public static SentryStackTraceElement convert(final Container container) {
 
-        final String file = ContainerUtil.extract(container, StackFrameTags.FILE_TAG).orElse(null);
+        final String file = ContainerUtil.extract(container, StackFrameTags.FILE_TAG).orElse("");
 
         return new SentryStackTraceElement(
-            ContainerUtil.extract(container, StackFrameTags.TYPE_TAG).orElse(null),
-            ContainerUtil.extract(container, StackFrameTags.FUNCTION_TAG).orElse(null),
+            ContainerUtil.extract(container, StackFrameTags.TYPE_TAG).orElse(""),
+            ContainerUtil.extract(container, StackFrameTags.FUNCTION_TAG).orElse(""),
             file,
             ContainerUtil.extract(container, StackFrameTags.LINE_NUMBER_TAG).orElse(0),
             ContainerUtil.extract(container, StackFrameTags.COLUMN_NUMBER_TAG).orElse(null),