[Logs 13] Attach server.address to Logs

sentry/api/sentry.api

@@ -589,6 +589,11 @@ public final class io/sentry/Hint {
 	public static fun withAttachments (Ljava/util/List;)Lio/sentry/Hint;
 }
 
+public final class io/sentry/HostnameCache {
+	public fun getHostname ()Ljava/lang/String;
+	public static fun getInstance ()Lio/sentry/HostnameCache;
+}
+
 public final class io/sentry/HttpStatusCodeRange {
 	public static final field DEFAULT_MAX I
 	public static final field DEFAULT_MIN I

sentry/src/main/java/io/sentry/HostnameCache.java

@@ -1,5 +1,6 @@
 package io.sentry;
 
+import io.sentry.util.AutoClosableReentrantLock;
 import io.sentry.util.Objects;
 import java.net.InetAddress;
 import java.util.concurrent.Callable;
@@ -11,6 +12,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,13 +27,16 @@
  * <p>HostnameCache is a singleton and its instance should be obtained through {@link
  * HostnameCache#getInstance()}.
  */
-final class HostnameCache {
+@ApiStatus.Internal
+public final class HostnameCache {
   private static final long HOSTNAME_CACHE_DURATION = TimeUnit.HOURS.toMillis(5);
 
   /** Time before the get hostname operation times out (in ms). */
   private static final long GET_HOSTNAME_TIMEOUT = TimeUnit.SECONDS.toMillis(1);
 
-  @Nullable private static HostnameCache INSTANCE;
+  private static volatile @Nullable HostnameCache INSTANCE;
+  private static final @NotNull AutoClosableReentrantLock staticLock =
+      new AutoClosableReentrantLock();
 
   /** Time for which the cache is kept. */
   private final long cacheDuration;
@@ -47,10 +52,15 @@ final class HostnameCache {
   private final @NotNull ExecutorService executorService =
       Executors.newSingleThreadExecutor(new HostnameCacheThreadFactory());
 
-  static @NotNull HostnameCache getInstance() {
+  public static @NotNull HostnameCache getInstance() {
     if (INSTANCE == null) {
-      INSTANCE = new HostnameCache();
+      try (final @NotNull ISentryLifecycleToken ignored = staticLock.acquire()) {
+        if (INSTANCE == null) {
+          INSTANCE = new HostnameCache();
+        }
+      }
     }
+
     return INSTANCE;
   }
 
@@ -93,7 +103,7 @@ boolean isClosed() {
    * @return the hostname of the current machine.
    */
   @Nullable
-  String getHostname() {
+  public String getHostname() {
     if (expirationTimestamp < System.currentTimeMillis()
         && updateRunning.compareAndSet(false, true)) {
       updateCache();

sentry/src/main/java/io/sentry/MainEventProcessor.java

@@ -7,7 +7,6 @@
 import io.sentry.protocol.SentryException;
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.User;
-import io.sentry.util.AutoClosableReentrantLock;
 import io.sentry.util.HintUtils;
 import io.sentry.util.Objects;
 import java.io.Closeable;
@@ -28,8 +27,6 @@ public final class MainEventProcessor implements EventProcessor, Closeable {
   private final @NotNull SentryThreadFactory sentryThreadFactory;
   private final @NotNull SentryExceptionFactory sentryExceptionFactory;
   private volatile @Nullable HostnameCache hostnameCache = null;
-  private final @NotNull AutoClosableReentrantLock hostnameCacheLock =
-      new AutoClosableReentrantLock();
 
   public MainEventProcessor(final @NotNull SentryOptions options) {
     this.options = Objects.requireNonNull(options, "The SentryOptions is required.");
@@ -183,11 +180,7 @@ private void setServerName(final @NotNull SentryBaseEvent event) {
 
   private void ensureHostnameCache() {
     if (hostnameCache == null) {
-      try (final @NotNull ISentryLifecycleToken ignored = hostnameCacheLock.acquire()) {
-        if (hostnameCache == null) {
-          hostnameCache = HostnameCache.getInstance();
-        }
-      }
+      hostnameCache = HostnameCache.getInstance();
     }
   }
 

sentry/src/main/java/io/sentry/logger/LoggerApi.java

@@ -1,5 +1,6 @@
 package io.sentry.logger;
 
+import io.sentry.HostnameCache;
 import io.sentry.IScope;
 import io.sentry.ISpan;
 import io.sentry.PropagationContext;
@@ -13,6 +14,7 @@
 import io.sentry.SpanId;
 import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.SentryId;
+import io.sentry.util.Platform;
 import io.sentry.util.TracingUtils;
 import java.util.HashMap;
 import org.jetbrains.annotations.ApiStatus;
@@ -163,9 +165,29 @@ private void captureLog(
 
     attributes.put(
         "sentry.trace.parent_span_id", new SentryLogEventAttributeValue("string", spanId));
+
+    if (Platform.isJvm()) {
+      setServerName(attributes);
+    }
+
     return attributes;
   }
 
+  private void setServerName(
+      final @NotNull HashMap<String, SentryLogEventAttributeValue> attributes) {
+    final @NotNull SentryOptions options = scopes.getOptions();
+    final @Nullable String optionsServerName = options.getServerName();
+    if (optionsServerName != null) {
+      attributes.put(
+          "server.address", new SentryLogEventAttributeValue("string", optionsServerName));
+    } else if (options.isAttachServerName()) {
+      final @Nullable String hostname = HostnameCache.getInstance().getHostname();
+      if (hostname != null) {
+        attributes.put("server.address", new SentryLogEventAttributeValue("string", hostname));
+      }
+    }
+  }
+
   private @NotNull String getType(final @Nullable Object arg) {
     if (arg instanceof Boolean) {
       return "boolean";