funcodingdev
diff --git a/‎sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java‎
Lines changed: 3 additions & 1 deletion b/‎sentry-core/src/main/java/io/sentry/core/MainEventProcessor.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎sentry-core/src/main/java/io/sentry/core/SentryOptions.java‎
Lines changed: 21 additions & 0 deletions b/‎sentry-core/src/main/java/io/sentry/core/SentryOptions.java‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎sentry-core/src/test/java/io/sentry/core/MainEventProcessorTest.kt‎
Lines changed: 6 additions & 0 deletions b/‎sentry-core/src/test/java/io/sentry/core/MainEventProcessorTest.kt‎
Lines changed: 6 additions & 0 deletions
@@ -67,7 +67,9 @@ private void processNonCachedEvent(SentryEvent event) {
     if (event.getEnvironment() == null) {
       event.setEnvironment(options.getEnvironment());
     }
-
+    if (event.getServerName() == null) {
+      event.setServerName(options.getServerName());
+    }
     if (event.getDist() == null) {
       event.setDist(options.getDist());
     }
 
@@ -146,6 +146,9 @@ public class SentryOptions {
    */
   private boolean attachStacktrace;
 
+  /** The server name used in the Sentry messages. */
+  private String serverName;
+
   /**
    * Adds an event processor
    *
@@ -632,6 +635,24 @@ public void setAttachThreads(boolean attachThreads) {
     this.attachThreads = attachThreads;
   }
 
+  /**
+   * Gets the default server name to be used in Sentry events.
+   *
+   * @return the default server name or null if none set
+   */
+  public @Nullable String getServerName() {
+    return serverName;
+  }
+
+  /**
+   * Sets the default server name to be used in Sentry events.
+   *
+   * @param serverName the default server name or null if none should be used
+   */
+  public void setServerName(@Nullable String serverName) {
+    this.serverName = serverName;
+  }
+
   /** The BeforeSend callback */
   public interface BeforeSendCallback {
 
 
@@ -16,6 +16,7 @@ class MainEventProcessorTest {
             release = "release"
             environment = "environment"
             dist = "dist"
+            serverName = "server"
         }
         fun getSut(attachThreads: Boolean = true): MainEventProcessor {
             sentryOptions.isAttachThreads = attachThreads
@@ -48,6 +49,7 @@ class MainEventProcessorTest {
         assertEquals("release", event.release)
         assertEquals("environment", event.environment)
         assertEquals("dist", event.dist)
+        assertEquals("server", event.serverName)
         assertTrue(event.threads.first { t -> t.id == crashedThread.id }.isCrashed)
     }
 
@@ -58,12 +60,14 @@ class MainEventProcessorTest {
         event.dist = "eventDist"
         event.environment = "eventEnvironment"
         event.release = "eventRelease"
+        event.serverName = "eventServerName"
 
         event = sut.process(event, null)
 
         assertEquals("eventRelease", event.release)
         assertEquals("eventEnvironment", event.environment)
         assertEquals("eventDist", event.dist)
+        assertEquals("eventServerName", event.serverName)
     }
 
     @Test
@@ -75,6 +79,8 @@ class MainEventProcessorTest {
 
         assertNull(event.release)
         assertNull(event.environment)
+        assertNull(event.dist)
+        assertNull(event.serverName)
         assertNull(event.threads)
     }
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ private void processNonCachedEvent(SentryEvent event) {`
`67`	`67`	`if (event.getEnvironment() == null) {`
`68`	`68`	`event.setEnvironment(options.getEnvironment());`
`69`	`69`	`}`
`70`		`-`
	`70`	`+ if (event.getServerName() == null) {`
	`71`	`+ event.setServerName(options.getServerName());`
	`72`	`+ }`
`71`	`73`	`if (event.getDist() == null) {`
`72`	`74`	`event.setDist(options.getDist());`
`73`	`75`	`}`