Update docs to use Hint object

src/includes/configuration/before-send-fingerprint/java.spring-boot.mdx

@@ -1,12 +1,13 @@
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
     if (event.getThrowable() instanceof SQLException) {
       event.setFingerprints(Arrays.asList("database-connection-error"));
     }
@@ -18,11 +19,12 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
+  override fun execute(event: SentryEvent, hint: Hint): SentryEvent? {
     if (event.throwable is SQLException) {
       event.fingerprints = listOf("database-connection-error")
     }

src/includes/configuration/before-send-fingerprint/java.spring.mdx

@@ -1,12 +1,13 @@
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
     if (event.getThrowable() instanceof SQLException) {
       event.setFingerprints(Arrays.asList("database-connection-error"));
     }
@@ -18,11 +19,12 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
+  override fun execute(event: SentryEvent, hint: Hint): SentryEvent? {
     if (event.throwable is SQLException) {
       event.fingerprints = listOf("database-connection-error")
     }

src/includes/configuration/before-send-hint/java.spring-boot.mdx

@@ -1,15 +1,16 @@
-A `BiFunction<SentryEvent, Object, SentryEvent>` can be used to mutate, discard (return null), or return a completely new event.
+A `BiFunction<SentryEvent, Hint, SentryEvent>` can be used to mutate, discard (return null), or return a completely new event.
 
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
-    if (hint instanceof MyHint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
+    if (hint.get("my-hint-key") != null) {
       return null;
     } else {
       return event;
@@ -21,12 +22,13 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
-    if (hint is MyHint) {
+  override fun execute(event: SentryEvent, hint: Hint): SentryEvent? {
+    if (hint["my-hint-key"] != null) {
       null
     } else {
       event

src/includes/configuration/before-send-hint/java.spring.mdx

@@ -1,15 +1,16 @@
-A `BiFunction<SentryEvent, Object, SentryEvent>` can be used to mutate, discard (return null), or return a completely new event.
+A `BiFunction<SentryEvent, Hint, SentryEvent>` can be used to mutate, discard (return null), or return a completely new event.
 
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
-    if (hint instanceof MyHint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
+    if (hint.get("my-hint-key") != null) {
       return null;
     } else {
       return event;
@@ -21,12 +22,13 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
-    if (hint is MyHint) {
+  override fun execute(event: SentryEvent, hint: Hnt): SentryEvent? {
+    if (hint["my-hint-key"] != null) {
       null
     } else {
       event

src/includes/configuration/before-send/java.spring-boot.mdx

@@ -3,12 +3,13 @@
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
     // Example: Never send server name in events
     event.setServerName(null);
     return event;
@@ -19,11 +20,12 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
+  override fun execute(event: SentryEvent, hint: Hint): SentryEvent? {
     // Example: Never send server name in events
     event.serverName = null
     return event

src/includes/configuration/before-send/java.spring.mdx

@@ -3,12 +3,13 @@
 ```java
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions;
+import io.sentry.Hint
 import org.springframework.stereotype.Component;
 
 @Component
 public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallback {
   @Override
-  public SentryEvent execute(SentryEvent event, Object hint) {
+  public SentryEvent execute(SentryEvent event, Hint hint) {
     // Example: Never send server name in events
     event.setServerName(null);
     return event;
@@ -19,11 +20,12 @@ public class CustomBeforeSendCallback implements SentryOptions.BeforeSendCallbac
 ```kotlin
 import io.sentry.SentryEvent
 import io.sentry.SentryOptions
+import io.sentry.Hint
 import org.springframework.stereotype.Component
 
 @Component
 class CustomBeforeSendCallback : SentryOptions.BeforeSendCallback {
-  override fun execute(event: SentryEvent, hint: Any?): SentryEvent? {
+  override fun execute(event: SentryEvent, hint: Hint): SentryEvent? {
     // Example: Never send server name in events
     event.serverName = null
     return event

src/includes/configuration/config-intro/java.mdx

@@ -25,13 +25,14 @@ public class MyClass {
 ```kotlin {tabTitle:Kotlin}
 import io.sentry.Sentry
 import io.sentry.SentryOptions.BeforeSendCallback
+import io.sentry.Hint
 
 fun main() {
   Sentry.init { options ->
     // your Sentry project/dashboard
     options.dsn = "___PUBLIC_DSN___"
     options.release = "io.sentry.samples.console@3.0.0+1"
-    options.beforeSend = BeforeSendCallback { event: SentryEvent, hint: Any? ->
+    options.beforeSend = BeforeSendCallback { event: SentryEvent, hint: Hint ->
       // Drop an event altogether:
       if (event.getTag("SomeTag") != null) {
         null

src/includes/enriching-events/add-attachment/java.mdx

@@ -0,0 +1,110 @@
+To add an attachment, you can either add it to the scope, pass it to any of the `capture` methods, or manipulate the list of attachments in an `EventProcessor` or `beforeSend`.
+
+### Passing Attachments to Capture
+
+You may pass attachments to any of the `capture` methods, for example, when capturing an exception:
+
+```java
+import io.sentry.Attachment;
+import io.sentry.Hint;
+import io.sentry.Sentry;
+
+Sentry.captureException(new IllegalStateException(), Hint.withAttachment("/path/to/file.txt"))
+```
+
+```kotlin
+import io.sentry.Attachment;
+import io.sentry.Hint;
+import io.sentry.Sentry;
+
+Sentry.captureException(IllegalStateException(), Hint.withAttachment("/path/to/file.txt"))
+```
+
+### Adding Attachments in `EventProcessor`
+
+You may also manipulate attachments in `EventProcessor`:
+
+```java
+import io.sentry.Attachment;
+import io.sentry.EventProcessor;
+import io.sentry.Hint;
+import io.sentry.Sentry;
+import io.sentry.SentryEvent;
+
+class AttachmentManipulationEventProcessor implements EventProcessor {
+  @Override
+  public SentryEvent process(SentryEvent event, Hint hint) {
+    hint.addAttachment(new Attachment("/path/to/file.txt"))
+    return event;
+  }
+}
+
+// Register the AttachmentManipulationEventProcessor using SentryOptions#addEventProcessor or Scope#addEventProcessor
+
+// Send an event to Sentry. During construction of the event
+// the attachment will be added by the event processor.
+Sentry.captureMessage("Hello, world!");
+```
+
+```kotlin
+import io.sentry.Attachment;
+import io.sentry.EventProcessor;
+import io.sentry.Hint;
+import io.sentry.Sentry
+import io.sentry.SentryEvent;
+import io.sentry.protocol.Message
+
+class AttachmentManipulationEventProcessor: EventProcessor {
+  override fun process(event: SentryEvent, hint: Hint): SentryEvent? {
+    hint.addAttachment(Attachment("/path/to/file.txt"))
+    return event
+  }
+}
+
+// Register the AttachmentManipulationEventProcessor using SentryOptions#addEventProcessor or Scope#addEventProcessor
+
+// Send an event to Sentry. During construction of the event
+// the attachment will be added by the event processor.
+Sentry.captureMessage("Hello, world!")
+```
+
+<Note>
+
+Instead of adding attachments, you can also remove them, by setting a different (or empty) list of attachments using `Hint#setAttachments()`.
+
+</Note>
+
+### Adding Attachments in `beforeSend`
+
+Another way of adding attachments is using `beforeSend`:
+
+```java
+import io.sentry.Attachment;
+import io.sentry.Hint;
+import io.sentry.Sentry;
+
+options.setBeforeSend((event, hint) -> {
+  hint.addAttachment(new Attachment("/path/to/file.txt"))
+  return event;
+});
+```
+
+```kotlin
+import io.sentry.Attachment;
+import io.sentry.Hint;
+import io.sentry.Sentry;
+import io.sentry.SentryOptions.BeforeSendCallback
+
+options.beforeSend = BeforeSendCallback { event, hint ->
+  hint.addAttachment(Attachment("/path/to/file.txt"))
+  event
+}
+```
+
+<Note>
+
+Instead of adding attachments, you can also remove them, by setting a different (or empty) list of attachments using `Hint#setAttachments()`.
+
+</Note>
+
+### Adding Attachments to the Scope

src/platforms/android/configuration/manual-init.mdx

@@ -22,7 +22,7 @@ Or, to completely remove the merging of the `ContentProvider`:
         android:name="io.sentry.android.core.SentryInitProvider"
         android:authorities="${applicationId}.SentryInitProvider"
         tools:node="remove" />
-  
+
     <provider
         android:name="io.sentry.android.core.SentryPerformanceProvider"
         android:authorities="${applicationId}.SentryPerformanceProvider"
@@ -63,6 +63,7 @@ public class SentryApplication extends Application {
 ```kotlin
 import io.sentry.android.core.SentryAndroid
 import io.sentry.SentryOptions.BeforeSendCallback
+import io.sentry.Hint
 import android.app.Application
 
 class SentryApplication : Application() {
@@ -74,7 +75,7 @@ class SentryApplication : Application() {
       // Add a callback that will be used before the event is sent to Sentry.
       // With this callback, you can modify the event or, when returning null, also discard the event.
       options.beforeSend =
-        BeforeSendCallback { event: SentryEvent, hint: Any? ->
+        BeforeSendCallback { event: SentryEvent, hint: Hint ->
           if (SentryLevel.DEBUG == event.level) {
             null
           } else {

src/platforms/android/migration.mdx

@@ -252,7 +252,7 @@ _New_:
 
 ```kotlin
 SentryOptions#addEventProcessor(object : EventProcessor {
-    override fun process(event: SentryEvent, hint: Any?): SentryEvent? {
+    override fun process(event: SentryEvent, hint: Hint): SentryEvent? {
         return event
     }
 })

src/platforms/common/enriching-events/attachments/index.mdx

@@ -84,7 +84,7 @@ In addition, you can set these parameters:
 
 ## Uploading Attachments
 
-<PlatformSection supported={["native", "javascript"]}>
+<PlatformSection supported={["native", "javascript", "java"]}>
 
 <PlatformSection supported={["javascript", "node"]}>