gitlab-labkit 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2476531528be243ed0069feffe3bbfbc7d557556455616e7d4216aa686422409
-  data.tar.gz: 43223820267f18725601573595ba607178788178b1922835becaf7c72d593b2f
+  metadata.gz: '079f4d5036a9fec36b5b6407aae14904afe2cf8e14805bd66e2bc4e7232fbf6a'
+  data.tar.gz: ba3f76216a9e26fd2208911ae51f147e94ffa3bb786922eec529f4188c35b91b
 SHA512:
-  metadata.gz: 712fd95e6a754409e83a8b5ee690c1843b233794a33a7461dea2fdc84c49eb8e873c7298ee15087302c32b60faeca83fd3592a80e471640a3c80710fa094e54e
-  data.tar.gz: e6d4d048caa06702bd47326574d105f32d9d5e7c27d3c619ac529e4cb35f671a7cfca92e1d9b6460a1b6080c90bc05306f2df17381ca6e104ad30a5171a22bb8
+  metadata.gz: 512596bceb4a8549af748a72e49286e3c1224ab1ae61d30f127685b70653fe30579c37d1091190cab19e244e016f5e2947b5892f51ba55b31651ccbc9e028706
+  data.tar.gz: de29c45094bafd62607471a8b0142ae3dffced97032d2a6b25c748a2a47347a5c815e5735d60985a98f6c43f3107ba901094ba814d1ff903d38c4f8ac6452b9b

data/lib/labkit/tracing.rb

@@ -28,6 +28,10 @@ module Labkit
       ENV["GITLAB_TRACING_URL"]
     end
 
+    def self.stacktrace_operations
+      @stacktrace_operations ||= Set.new(ENV["GITLAB_TRACING_INCLUDE_STACKTRACE"].to_s.split(",").map(&:strip))
+    end
+
     def self.tracing_url_enabled?
       enabled? && tracing_url_template.present?
     end

data/lib/labkit/tracing/rails/abstract_instrumenter.rb

@@ -17,6 +17,8 @@ module Labkit
           scope = scope_stack.pop
           span = scope.span
 
+          Labkit::Tracing::TracingUtils.log_common_fields_on_span(span, span_name(payload))
+
           exception = payload[:exception]
           Labkit::Tracing::TracingUtils.log_exception_on_span(span, exception) if exception
 

data/lib/labkit/tracing/tracing_utils.rb

@@ -12,9 +12,7 @@ module Labkit
         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
@@ -35,11 +33,19 @@ module Labkit
       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)
@@ -60,6 +66,14 @@ module Labkit
           { :"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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Andrew Newdigate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack