googleapis
diff --git a/‎google/cloud/logging_v2/handlers/app_engine.py
Copy file name to clipboardExpand all lines: google/cloud/logging_v2/handlers/app_engine.py
+13-5Lines changed: 13 additions & 5 deletions b/‎google/cloud/logging_v2/handlers/app_engine.py
Copy file name to clipboardExpand all lines: google/cloud/logging_v2/handlers/app_engine.py
+13-5Lines changed: 13 additions & 5 deletions
@@ -113,15 +113,23 @@ def emit(self, record):
             record (logging.LogRecord): The record to be logged.
         """
         message = super(AppEngineHandler, self).format(record)
+        inferred_http, inferred_trace_id = get_request_data()
+        # allow user overrides
+        trace_id = record.__dict__.get('trace', inferred_trace_id)
+        span_id = record.__dict__.get('span_id', None)
+        http_request = record.__dict__.get('http_request', inferred_http)
+        resource = record.__dict__.get('resource', self.resource)
+        user_labels = record.__dict__.get('labels', {})
+        # merge labels
         gae_labels = self.get_gae_labels()
-        http_request, trace_id = get_request_data()
-        if trace_id is not None:
-            trace_id = f"projects/{self.project_id}/{trace_id}"
+        gae_labels.update(user_labels)
+        # send off request
         self.transport.send(
             record,
             message,
-            resource=self.resource,
+            resource=resource,
             labels=gae_labels,
-            trace=trace_id,
+            trace= f"projects/{self.project_id}/{trace_id}",
+          #  span_id=span_id,
             http_request=http_request,
         )