lib/labkit/tracing/tracing_utils.rb in gitlab-labkit-0.10.1 vs lib/labkit/tracing/tracing_utils.rb in gitlab-labkit-0.11.0

@@ -10,13 +10,11 @@
       # Convience method for running a block with a span
       def self.with_tracing(operation_name:, tags:, child_of: nil)
         scope = tracer.start_active_span(operation_name, child_of: child_of, tags: tags)
         span = scope.span
 
-        # Add correlation details to the span if we have them
-        correlation_id = Labkit::Correlation::CorrelationId.current_id
-        span.set_tag("correlation_id", correlation_id) if correlation_id
+        log_common_fields_on_span(span, operation_name)
 
         begin
           yield span
         rescue StandardError => e
           log_exception_on_span(span, e)
@@ -33,15 +31,23 @@
 
       # Generate a span retrospectively
       def self.postnotify_span(operation_name, start_time, end_time, tags: nil, child_of: nil, exception: nil)
         span = OpenTracing.start_span(operation_name, start_time: start_time, tags: tags, child_of: child_of)
 
+        log_common_fields_on_span(span, operation_name)
         log_exception_on_span(span, exception) if exception
 
         span.finish(end_time: end_time)
       end
 
+      # Add common fields to a span
+      def self.log_common_fields_on_span(span, operation_name)
+        correlation_id = Labkit::Correlation::CorrelationId.current_id
+        span.set_tag("correlation_id", correlation_id) if correlation_id
+        span.log_kv(stack: caller.join('\n')) if include_stacktrace?(operation_name)
+      end
+
       # Add exception logging to a span
       def self.log_exception_on_span(span, exception)
         span.set_tag("error", true)
         span.log_kv(kv_tags_for_exception(exception))
       end
@@ -57,9 +63,17 @@
             :"stack" => exception.backtrace&.join('\n'),
           }
         else
           { :"event" => "error", :"error.kind" => exception.class.to_s, :"error.object" => Labkit::Logging::Sanitizer.sanitize_field(exception.to_s) }
         end
+      end
+
+      def self.include_stacktrace?(operation_name)
+        @include_stacktrace ||= Hash.new do |result, name|
+          result[name] = Tracing.stacktrace_operations.any? { |stacktrace_operation| name.starts_with?(stacktrace_operation) }
+        end
+
+        @include_stacktrace[operation_name]
       end
     end
   end
 end