test(tinylog): assert service, env and version in submitted events

Author: daniel-mohedano

dd-java-agent/instrumentation/tinylog-2.0/src/test/java/TinylogLogsIntakeForkedTest.java

@@ -1,9 +1,11 @@
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_LEVEL;
+import static datadog.trace.api.config.GeneralConfig.ENV;
+import static datadog.trace.api.config.GeneralConfig.SERVICE_NAME;
+import static datadog.trace.api.config.GeneralConfig.VERSION;
 import static datadog.trace.api.config.TraceInstrumentationConfig.LOGS_INJECTION_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_ENABLED;
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -18,6 +20,7 @@
 import datadog.trace.api.logging.intake.LogsWriter;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
+import datadog.trace.bootstrap.instrumentation.api.Tags;
 import datadog.trace.instrumentation.tinylog2.ContextWriter;
 import datadog.trace.test.junit.utils.config.WithConfig;
 import java.util.HashMap;
@@ -47,6 +50,9 @@
     key = "tinylog.writer2",
     value = "datadog.trace.instrumentation.tinylog2.ContextWriter",
     addPrefix = false)
+@WithConfig(key = SERVICE_NAME, value = "tinylog-service")
+@WithConfig(key = ENV, value = "tinylog-env")
+@WithConfig(key = VERSION, value = "1.0")
 abstract class AbstractTinylogLogsIntakeForkedTest extends AbstractInstrumentationTest {
   static final List<Map<String, Object>> MESSAGES = new CopyOnWriteArrayList<>();
 
@@ -80,6 +86,16 @@ static boolean injection() {
     return Config.get().isLogsInjectionEnabled();
   }
 
+  static Map<String, String> serviceTags() {
+    Map<String, String> tags = new HashMap<>();
+    if (injection()) {
+      tags.put(Tags.DD_SERVICE, "tinylog-service");
+      tags.put(Tags.DD_ENV, "tinylog-env");
+      tags.put(Tags.DD_VERSION, "1.0");
+    }
+    return tags;
+  }
+
   static boolean writingThread() {
     return Boolean.getBoolean("tinylog.writingthread");
   }
@@ -164,7 +180,7 @@ void submitsProducerContextAndPreservesUserContext() throws Exception {
       return;
     }
     assertEquals(asList("active", "child", "collision", "outside"), values("message"));
-    Map<String, String> expected = new HashMap<>();
+    Map<String, String> expected = serviceTags();
     if (injection()) {
       expected.put("dd.trace_id", traceId);
       expected.put("dd.span_id", spanId);
@@ -174,7 +190,7 @@ void submitsProducerContextAndPreservesUserContext() throws Exception {
     assertEquals(injection() ? traceId : null, contextMap(1).get("dd.trace_id"));
     assertEquals(injection() ? childSpanId : null, contextMap(1).get("dd.span_id"));
     assertEquals("user-trace", contextMap(2).get("dd.trace_id"));
-    assertEquals(emptyMap(), contextMap(3));
+    assertEquals(serviceTags(), contextMap(3));
   }
 
   static List<Object> values(String key) {