buildkite-test_collector 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d5188350d19431be80e4d9680a9a561d4ae25f64549d5be488607d1882a5c1
-  data.tar.gz: aece9ddaddba6792fcf2fa91f8642e5be3712bf118f154f6e152f0cbad5aa9eb
+  metadata.gz: 0e8ff4ceff4d825291a8878bf19a912362d45c36d6750c5e14628f446cec0bbd
+  data.tar.gz: 215441296a3c91547b0c43b062893239fbe5bae5ca2e1a80cca7b2ec65277e77
 SHA512:
-  metadata.gz: 6eb7578e7cad14c2088b6bb522eb3548cccd6de33dd09952fc4d4fd8638a707f9abaa8b68060fefd3eab212ab7a23d114cba0f4155e9394b13277b1b67719652
-  data.tar.gz: 6d1f20581f34336eb39e22a753661d5cd9b9feaf05a7773ca6d3171ec50ef335a61ec6697f9baeab4526810e0ed400981fae1738a78637179fbadae452a1995d
+  metadata.gz: d31e59e76f2dc92ef5951f9d97663f14cb84d9ba1256c8586931146151222c7ce3769a8913517910312d0a75a7cafb3488f0b9690257c4fc6686fbf37cbed9ee
+  data.tar.gz: 995fc9e592b74a41385058c4eac868e9639f6ef9bfb2ba9068cd156fd6ab5d90bf40aca86a9ab9c8560cf7c9ba80c4f172747a948e4e219976c680d035eae0af

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # CHANGELOG
 
+## v2.6.0
+
+- Trace spans can be filtered by minimum duration #215 - @pda
+
+## v2.5.0
+
+- Remove ActiveSupport as a primary dependancy #212 - @pat
+
 ## v2.4.0
 
-- Feature release: Output links to Test Analytic tests within the rspec log @meghan-kradolfer
+- Feature release: Output links to Test Analytic tests within the rspec log #209 - @meghan-kradolfer
 
 ## v2.3.2
 

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    buildkite-test_collector (2.4.0)
-      activesupport (>= 4.2)
+    buildkite-test_collector (2.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -38,6 +37,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 4.2)
   buildkite-test_collector!
   rake (~> 13.0)
   rspec (~> 3.0)

data/buildkite-test_collector.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
-  spec.add_dependency "activesupport", ">= 4.2"
-
+  spec.add_development_dependency "activesupport", ">= 4.2"
   spec.add_development_dependency "rspec-core", '~> 3.10'
   spec.add_development_dependency "rspec-expectations", '~> 3.10'
 end

data/lib/buildkite/test_collector/ci.rb

@@ -40,6 +40,7 @@ class Buildkite::TestCollector::CI
       "language_version" => RUBY_VERSION,
       "version" => Buildkite::TestCollector::VERSION,
       "collector" => "ruby-#{Buildkite::TestCollector::NAME}",
+      "trace_min_duration" => Buildkite::TestCollector.trace_min_duration&.to_s,
     }.select { |_, value| !value.nil? }
   end
 

data/lib/buildkite/test_collector/library_hooks/rspec.rb

@@ -16,7 +16,9 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
-    tracer = Buildkite::TestCollector::Tracer.new
+    tracer = Buildkite::TestCollector::Tracer.new(
+      min_duration: Buildkite::TestCollector.trace_min_duration,
+    )
 
     # The _buildkite prefix here is added as a safeguard against name collisions
     # as we are in the main thread

data/lib/buildkite/test_collector/minitest_plugin/trace.rb

@@ -38,7 +38,7 @@ module Buildkite::TestCollector::MinitestPlugin
         failure_reason: failure_reason,
         failure_expanded: failure_expanded,
         history: history,
-      ).with_indifferent_access.select { |_, value| !value.nil? }
+      ).select { |_, value| !value.nil? }
     end
 
     private

data/lib/buildkite/test_collector/minitest_plugin.rb

@@ -9,7 +9,11 @@ require_relative "minitest_plugin/trace"
 module Buildkite::TestCollector::MinitestPlugin
   def before_setup
     super
-    tracer = Buildkite::TestCollector::Tracer.new
+
+    tracer = Buildkite::TestCollector::Tracer.new(
+      min_duration: Buildkite::TestCollector.trace_min_duration,
+    )
+
     # The _buildkite prefix here is added as a safeguard against name collisions
     # as we are in the main thread
     Thread.current[:_buildkite_tracer] = tracer

data/lib/buildkite/test_collector/rspec_plugin/reporter.rb

@@ -40,6 +40,10 @@ module Buildkite::TestCollector::RSpecPlugin
       RSpec::Core::MultipleExceptionError
     ]
 
+    def blank?(string)
+      string.nil? || string.strip.empty?
+    end
+
     def failure_info(notification)
       failure_expanded = []
 
@@ -73,9 +77,9 @@ module Buildkite::TestCollector::RSpecPlugin
     def format_message_lines(message_lines)
       message_lines.map! { |l| strip_diff_colors(l) }
       # the first line is sometimes blank, depending on the error reported
-      message_lines.shift if message_lines.first.blank?
+      message_lines.shift if blank?(message_lines.first)
       # the last line is sometimes blank, depending on the error reported
-      message_lines.pop if message_lines.last.blank?
+      message_lines.pop if blank?(message_lines.last)
       message_lines
     end
 

data/lib/buildkite/test_collector/rspec_plugin/trace.rb

@@ -32,7 +32,7 @@ module Buildkite::TestCollector::RSpecPlugin
         failure_reason: failure_reason,
         failure_expanded: failure_expanded,
         history: history,
-      ).with_indifferent_access.select { |_, value| !value.nil? }
+      ).select { |_, value| !value.nil? }
     end
 
     private
@@ -60,7 +60,7 @@ module Buildkite::TestCollector::RSpecPlugin
     end
 
     def shared_example?
-      example.metadata[:shared_group_inclusion_backtrace].any?
+      !example.metadata[:shared_group_inclusion_backtrace].empty?
     end
 
     def shared_example_call_location

data/lib/buildkite/test_collector/test_links_plugin/formatter.rb

@@ -10,7 +10,7 @@ module Buildkite::TestCollector::TestLinksPlugin
 
     def dump_failures(notification)
       # Do not display summary if no failed examples
-      return unless notification.failed_examples.present?
+      return if notification.failed_examples.empty?
 
       # Check if a Test Analytics token is set
       return unless Buildkite::TestCollector.api_token

data/lib/buildkite/test_collector/tracer.rb

@@ -35,21 +35,30 @@ module Buildkite::TestCollector
         @children = []
       end
 
+      def duration
+        raise IncompleteSpan if end_at.nil?
+
+        end_at - start_at
+      end
+
       def as_hash
         {
           section: section,
           start_at: start_at,
           end_at: end_at,
-          duration: end_at - start_at,
+          duration: duration,
           detail: detail,
           children: children.map(&:as_hash),
-        }.with_indifferent_access
+        }
       end
+
+      class IncompleteSpan < StandardError; end
     end
 
-    def initialize
+    def initialize(min_duration: nil)
       @top = Span.new(:top, MonotonicTime.call, nil, {})
       @stack = [@top]
+      @min_duration = min_duration
     end
 
     def enter(section, **detail)
@@ -60,11 +69,16 @@ module Buildkite::TestCollector
 
     def leave
       current_span.end_at = MonotonicTime.call
+      duration = current_span.duration
       @stack.pop
+      current_span.children.pop if @min_duration && duration < @min_duration
+      nil # avoid ambiguous return type/value
     end
 
     def backfill(section, duration, **detail)
-      new_entry = Span.new(section, MonotonicTime.call - duration, MonotonicTime.call, detail)
+      return if @min_duration && duration < @min_duration
+      now = MonotonicTime.call
+      new_entry = Span.new(section, now - duration, now, detail)
       current_span.children << new_entry
     end
 

data/lib/buildkite/test_collector/version.rb

@@ -2,7 +2,7 @@
 
 module Buildkite
   module TestCollector
-    VERSION = "2.4.0"
+    VERSION = "2.6.0"
     NAME = "buildkite-test_collector"
   end
 end

data/lib/buildkite/test_collector.rb

@@ -8,14 +8,11 @@ end
 require "json"
 require "logger"
 require "net/http"
+require "openssl"
 require "time"
 require "timeout"
 require "tmpdir"
 
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/hash/indifferent_access"
-require "active_support/notifications"
-
 require_relative "test_collector/version"
 require_relative "test_collector/error"
 require_relative "test_collector/ci"
@@ -41,6 +38,7 @@ module Buildkite
       attr_accessor :artifact_path
       attr_accessor :env
       attr_accessor :batch_size
+      attr_accessor :trace_min_duration
     end
 
     def self.configure(hook:, token: nil, url: nil, tracing_enabled: true, artifact_path: nil, env: {})
@@ -50,6 +48,12 @@ module Buildkite
       self.artifact_path = artifact_path
       self.env = env
       self.batch_size = ENV.fetch("BUILDKITE_ANALYTICS_UPLOAD_BATCH_SIZE") { DEFAULT_UPLOAD_BATCH_SIZE }.to_i
+
+      trace_min_ms_string = ENV["BUILDKITE_ANALYTICS_TRACE_MIN_MS"]
+      self.trace_min_duration = if trace_min_ms_string && !trace_min_ms_string.empty?
+        Float(trace_min_ms_string) / 1000
+      end
+
       self.hook_into(hook)
     end
 
@@ -72,6 +76,10 @@ module Buildkite
       Buildkite::TestCollector::Network.configure
       Buildkite::TestCollector::Object.configure
 
+      return unless defined?(ActiveSupport)
+
+      require "active_support/notifications"
+
       ActiveSupport::Notifications.subscribe("sql.active_record") do |name, start, finish, id, payload|
         Buildkite::TestCollector::Uploader.tracer&.backfill(:sql, finish - start, **{ query: payload[:sql] })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-test_collector
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Buildkite
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Track test executions and report to Buildkite Test Analytics