Merge 58e96bf into 4e29063

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - (Internal) Extract Android Profiler and Measurements for Hybrid SDKs ([#3016](https://github.com/getsentry/sentry-java/pull/3016))
 - Ensure DSN uses http/https protocol ([#3044](https://github.com/getsentry/sentry-java/pull/3044))
+- (Internal) Add `readBytesFromFile` for use in Hybrid SDKs ([#3052](https://github.com/getsentry/sentry-java/pull/3052))
 
 ### Features
 

sentry/api/sentry.api

@@ -4365,6 +4365,7 @@ public final class io/sentry/util/ExceptionUtils {
 public final class io/sentry/util/FileUtils {
 	public fun <init> ()V
 	public static fun deleteRecursively (Ljava/io/File;)Z
+	public static fun readBytesFromFile (Ljava/lang/String;J)[B
 	public static fun readText (Ljava/io/File;)Ljava/lang/String;
 }
 

sentry/src/main/java/io/sentry/SentryEnvelopeItem.java

@@ -1,5 +1,6 @@
 package io.sentry;
 
+import static io.sentry.util.FileUtils.readBytesFromFile;
 import static io.sentry.vendor.Base64.NO_PADDING;
 import static io.sentry.vendor.Base64.NO_WRAP;
 
@@ -9,13 +10,11 @@
 import io.sentry.util.JsonSerializationUtils;
 import io.sentry.util.Objects;
 import io.sentry.vendor.Base64;
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -304,48 +303,6 @@ private static void ensureAttachmentSizeLimit(
     return new SentryEnvelopeItem(itemHeader, () -> cachedItem.getBytes());
   }
 
-  private static byte[] readBytesFromFile(String pathname, long maxFileLength)
-      throws SentryEnvelopeException {
-    try {
-      File file = new File(pathname);
-
-      if (!file.isFile()) {
-        throw new SentryEnvelopeException(
-            String.format(
-                "Reading the item %s failed, because the file located at the path is not a file.",
-                pathname));
-      }
-
-      if (!file.canRead()) {
-        throw new SentryEnvelopeException(
-            String.format("Reading the item %s failed, because can't read the file.", pathname));
-      }
-
-      if (file.length() > maxFileLength) {
-        throw new SentryEnvelopeException(
-            String.format(
-                "Dropping item, because its size located at '%s' with %d bytes is bigger "
-                    + "than the maximum allowed size of %d bytes.",
-                pathname, file.length(), maxFileLength));
-      }
-
-      try (FileInputStream fileInputStream = new FileInputStream(pathname);
-          BufferedInputStream inputStream = new BufferedInputStream(fileInputStream);
-          ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-        byte[] bytes = new byte[1024];
-        int length;
-        int offset = 0;
-        while ((length = inputStream.read(bytes)) != -1) {
-          outputStream.write(bytes, offset, length);
-        }
-        return outputStream.toByteArray();
-      }
-    } catch (IOException | SecurityException exception) {
-      throw new SentryEnvelopeException(
-          String.format("Reading the item %s failed.\n%s", pathname, exception.getMessage()));
-    }
-  }
-
   public static @NotNull SentryEnvelopeItem fromClientReport(
       final @NotNull ISerializer serializer, final @NotNull ClientReport clientReport)
       throws IOException {

sentry/src/main/java/io/sentry/util/FileUtils.java

@@ -1,7 +1,10 @@
 package io.sentry.util;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import org.jetbrains.annotations.ApiStatus;
@@ -60,4 +63,52 @@ public static boolean deleteRecursively(@Nullable File file) {
     }
     return contentBuilder.toString();
   }
+
+  /**
+   * Reads the content of a path into a byte array. If the path is does not exists, it's not a file,
+   * can't be read or is larger than max size allowed IOException is thrown. Do not use with large
+   * files, as the byte array is kept in memory!
+   *
+   * @param pathname file to read
+   * @return a byte array containing all the content of the file
+   * @throws IOException In case of error reading the file
+   */
+  public static byte[] readBytesFromFile(String pathname, long maxFileLength)
+      throws IOException, SecurityException {
+    File file = new File(pathname);
+
+    if (!file.exists()) {
+      throw new IOException(String.format("File '%s' doesn't exists", file.getName()));
+    }
+
+    if (!file.isFile()) {
+      throw new IOException(
+          String.format("Reading path %s failed, because it's not a file.", pathname));
+    }
+
+    if (!file.canRead()) {
+      throw new IOException(
+          String.format("Reading the item %s failed, because can't read the file.", pathname));
+    }
+
+    if (file.length() > maxFileLength) {
+      throw new IOException(
+          String.format(
+              "Reading file failed, because size located at '%s' with %d bytes is bigger "
+                  + "than the maximum allowed size of %d bytes.",
+              pathname, file.length(), maxFileLength));
+    }
+
+    try (FileInputStream fileInputStream = new FileInputStream(pathname);
+        BufferedInputStream inputStream = new BufferedInputStream(fileInputStream);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+      byte[] bytes = new byte[1024];
+      int length;
+      int offset = 0;
+      while ((length = inputStream.read(bytes)) != -1) {
+        outputStream.write(bytes, offset, length);
+      }
+      return outputStream.toByteArray();
+    }
+  }
 }