fix(logging): fix service in log correlation (#3267) (#3295)

* fix(logging): fix service in log correlation

* Update ddtrace/tracer.py

* fix opentracer test

Co-authored-by: Tahir H. Butt <[email protected]>
Co-authored-by: Tahir H. Butt <[email protected]>
Co-authored-by: Brett Langdon <[email protected]>
(cherry picked from commit 7c18eca)

Co-authored-by: Mehdi ABAAKOUK <[email protected]>
Co-authored-by: Brett Langdon <[email protected]>

Author: 3 people

ddtrace/tracer.py

@@ -274,10 +274,15 @@ def get_log_correlation_context(self):
         if self.enabled:
             span = self.current_span()
 
+        if span and span.service:
+            service = span.service
+        else:
+            service = config.service
+
         return {
             "trace_id": str(span.trace_id) if span else "0",
             "span_id": str(span.span_id) if span else "0",
-            "service": config.service or "",
+            "service": service or "",
             "version": config.version or "",
             "env": config.env or "",
         }

releasenotes/notes/fix-log-correlation-service-ce734c2134125124.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Set correct service in logs correlation attributes when a span override the service.
+

tests/tracer/test_correlation_log_context.py

@@ -26,6 +26,29 @@ def tracer_injection(logger, log_method, event_dict):
 
 
 class TestCorrelationLogsContext(object):
+    def test_get_log_correlation_service(self, global_config):
+        """Ensure expected DDLogRecord service is generated via get_correlation_log_record."""
+        with tracer.trace("test-span-1", service="span-service") as span1:
+            dd_log_record = tracer.get_log_correlation_context()
+        assert dd_log_record == {
+            "span_id": str(span1.span_id),
+            "trace_id": str(span1.trace_id),
+            "service": "span-service",
+            "env": "test-env",
+            "version": "test-version",
+        }
+
+        test_tracer = Tracer()
+        with test_tracer.trace("test-span-2", service="span-service") as span2:
+            dd_log_record = test_tracer.get_log_correlation_context()
+        assert dd_log_record == {
+            "span_id": str(span2.span_id),
+            "trace_id": str(span2.trace_id),
+            "service": "span-service",
+            "env": "test-env",
+            "version": "test-version",
+        }
+
     def test_get_log_correlation_context(self, global_config):
         """Ensure expected DDLogRecord is generated via get_correlation_log_record."""
         with tracer.trace("test-span-1") as span1:
@@ -50,7 +73,7 @@ def test_get_log_correlation_context(self, global_config):
 
     def test_get_log_correlation_context_opentracer(self, global_config):
         """Ensure expected DDLogRecord generated via get_correlation_log_record with an opentracing Tracer."""
-        ot_tracer = OT_Tracer()
+        ot_tracer = OT_Tracer(service_name="test-service")
         with ot_tracer.start_active_span("operation") as scope:
             dd_span = scope._span._dd_span
             dd_log_record = ot_tracer.get_log_correlation_context()