674: add span/sampled values to LogEntry, add source log info labels

quarkiverse · Sep 20, 2024 · 304c2e4 · 304c2e4
1 parent e200f31
commit 304c2e4
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/...time/src/main/java/io/quarkiverse/googlecloudservices/logging/runtime/LoggingHandler.java b/...time/src/main/java/io/quarkiverse/googlecloudservices/logging/runtime/LoggingHandler.java
@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.logging.ErrorManager;
+import java.util.logging.Level;
 
 import org.jboss.logmanager.ExtHandler;
 import org.jboss.logmanager.ExtLogRecord;
@@ -11,6 +12,7 @@
 import com.google.cloud.logging.Logging;
 import com.google.cloud.logging.Logging.WriteOption;
 import com.google.cloud.logging.Payload;
+import com.google.cloud.logging.Severity;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 
@@ -25,6 +27,10 @@
 
 public class LoggingHandler extends ExtHandler {
 
+    private static final String LEVEL_NAME_KEY = "levelName";
+    private static final String LEVEL_VALUE_KEY = "levelValue";
+    private static final String LOGGER_NAME_KEY = "loggerName";
+
     private final LoggingConfiguration config;
 
     // lazy values, they depend on the gcp config which in turn
@@ -79,11 +85,24 @@ public void doPublish(ExtLogRecord record) {
     private LogEntry transform(ExtLogRecord record, TraceInfo trace) {
         Payload<?> payload = internalHandler.transform(record, trace);
         if (payload != null) {
+            Level level = record.getLevel();
+            Severity severity = LevelTransformer.toSeverity(level);
             com.google.cloud.logging.LogEntry.Builder builder = LogEntry.newBuilder(payload)
-                    .setSeverity(LevelTransformer.toSeverity(record.getLevel()))
-                    .setTimestamp(record.getInstant());
+                    .setSeverity(severity)
+                    .setTimestamp(record.getInstant())
+                    .addLabel(LEVEL_NAME_KEY, level.toString())
+                    .addLabel(LEVEL_VALUE_KEY, String.valueOf(level.intValue()));
+
+            String loggerName = record.getSourceClassName();
+            if (!Strings.isNullOrEmpty(loggerName)) {
+                builder = builder.addLabel(LOGGER_NAME_KEY, loggerName);
+            }
+
             if (this.config.gcpTracing().enabled() && trace != null && !Strings.isNullOrEmpty(trace.getTraceId())) {
-                builder = builder.setTrace(composeTraceString(trace.getTraceId()));
+                builder = builder
+                        .setTrace(composeTraceString(trace.getTraceId()))
+                        .setSpanId(trace.getSpanId())
+                        .setTraceSampled(true);
             }
             return builder.build();
         } else {