buildkite-test_collector 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1b8d87ace52bb67aa1b58a9c4312fbb067ce244ab56c505acdbd8a8f4f914c
-  data.tar.gz: dd5a2cd67e8d3765f04bec6b204485de15fc55c9d9b76f21940f100517636177
+  metadata.gz: 96fb0d0c08ff10d420388b2438ae199c7fbf72878d1fa5631c68b27e70f11cac
+  data.tar.gz: 78846d669900e535d1e03bd7494611dd124f2c1bae59471ad41b5b0d9f1efb1b
 SHA512:
-  metadata.gz: 73f95180c00f9e5ef767da6266ab391020b43707b666cb04c948b6b0fba4f3c68d9e37a7c023d3f508f7ae70ae219224c3145cc47e071ce77155d9bdb86e8dbe
-  data.tar.gz: 8de30643055606915e936f1e41adf06f619394577cbd01e24dc074877672af29ca93b1020dafffa0635b97ee5c508b47da004387660b58fe15ee9da1f49ad9dc
+  metadata.gz: c7151f06cf10d7aeb296b9d8c9294f9cdab0b07fc01112176cdc28ad55f7b65d4aa51fcc21dfd179eb58bc6c69592583f58335dece7f3b46ac1e2ba7718da369
+  data.tar.gz: cb1157c4a4cfaa719d852f2ac271bd09bbd25a461b4f6a9c002063d7461e3bb06e8107342cceb77dada1cda8090c3643aa3e2827aac7355fea90b51bbae4f7f0

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## v1.1.1
+
+- Strip CR/LF from token input #127 - @gchan
+- Allow specify run name prefix and suffix #130 - @juanitofatas
+- Improve Minitest support by using after_teardown #131 - @davidstosik
+- Avoid breaking test suite stubs `Process.clock_gettime` #132 - @juanitofatas (thanks @ChrisBR)
+
+## v1.1.0
+
+- Remove an internal debugging change #115 — @juanitofatas
+- Remove warnings #116 - @juanitofatas
+- Fix old gem name still in debugging and warning messages #117 - @juanitofatas
+- Include module from `Minitest` #118 - @juanitofatas
+- Fix Minitest loading without using minitest hook #125 — @paulca
+
 ## v1.0.1
 
 - Fix project_dir issue expecting a string, not a Pathname #112 — @paulca

data/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in rspec-buildkite-analytics.gemspec
+# Specify your gem's dependencies in the gemspec
 gemspec
 
 gem "rake", "~> 13.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildkite-test_collector (1.0.1)
+    buildkite-test_collector (1.1.1)
       activesupport (>= 5.2, < 8)
       websocket (~> 1.2)
 
@@ -17,7 +17,7 @@ GEM
     diff-lcs (1.4.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.15.0)
+    minitest (5.16.1)
     rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/lib/buildkite/test_collector/ci.rb

@@ -39,7 +39,9 @@ class Buildkite::TestCollector::CI
       "debug" => ENV["BUILDKITE_ANALYTICS_DEBUG_ENABLED"],
       "version" => Buildkite::TestCollector::VERSION,
       "collector" => Buildkite::TestCollector::NAME,
-  }.compact
+      "run_name_prefix" => ENV["BUILDKITE_ANALYTICS_RUN_NAME_PREFIX"],
+      "run_name_suffix" => ENV["BUILDKITE_ANALYTICS_RUN_NAME_SUFFIX"],
+    }.compact
   end
 
   def generic

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

@@ -7,7 +7,7 @@ require_relative "../minitest_plugin"
 
 Buildkite::TestCollector.uploader = Buildkite::TestCollector::Uploader
 
-class MiniTest::Test
+class Minitest::Test
   include Buildkite::TestCollector::MinitestPlugin
 end
 

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

@@ -4,7 +4,8 @@ require "active_support/core_ext/hash/indifferent_access"
 
 module Buildkite::TestCollector::MinitestPlugin
   class Trace
-    attr_accessor :example, :failure_reason, :failure_expanded
+    attr_accessor :example
+    attr_writer :failure_reason, :failure_expanded
     attr_reader :id, :history
 
     RESULT_CODES = {

data/lib/buildkite/test_collector/minitest_plugin.rb

@@ -12,9 +12,7 @@ module Buildkite::TestCollector::MinitestPlugin
     Thread.current[:_buildkite_tracer] = tracer
   end
 
-  def before_teardown
-    super
-
+  def after_teardown
     tracer = Thread.current[:_buildkite_tracer]
     if !tracer.nil?
       Thread.current[:_buildkite_tracer] = nil
@@ -23,5 +21,7 @@ module Buildkite::TestCollector::MinitestPlugin
       trace = Buildkite::TestCollector::MinitestPlugin::Trace.new(self, history: tracer.history)
       Buildkite::TestCollector.uploader.traces[trace.source_location] = trace
     end
+
+    super
   end
 end

data/lib/buildkite/test_collector/session.rb

@@ -42,9 +42,9 @@ module Buildkite::TestCollector
         reconnection_count += 1
         connect
       rescue TimeoutError, InitialConnectionFailure => e
-        Buildkite::TestCollector.logger.warn("rspec-buildkite-analytics could not establish an initial connection with Buildkite due to #{e}. Attempting retry #{reconnection_count} of #{MAX_RECONNECTION_ATTEMPTS}...")
+        Buildkite::TestCollector.logger.warn("buildkite-test_collector could not establish an initial connection with Buildkite due to #{e}. Attempting retry #{reconnection_count} of #{MAX_RECONNECTION_ATTEMPTS}...")
         if reconnection_count > MAX_RECONNECTION_ATTEMPTS
-          Buildkite::TestCollector.logger.error "rspec-buildkite-analytics could not establish an initial connection with Buildkite due to #{e.message} after #{MAX_RECONNECTION_ATTEMPTS} attempts. You may be missing some data for this test suite, please contact support if this issue persists."
+          Buildkite::TestCollector.logger.error "buildkite-test_collector could not establish an initial connection with Buildkite due to #{e.message} after #{MAX_RECONNECTION_ATTEMPTS} attempts. You may be missing some data for this test suite, please contact support if this issue persists."
         else
           sleep(WAIT_BETWEEN_RECONNECTIONS)
           Buildkite::TestCollector.logger.warn("retrying reconnection")
@@ -77,7 +77,7 @@ module Buildkite::TestCollector
         rescue *DISCONNECTED_EXCEPTIONS => e
           Buildkite::TestCollector.logger.warn("failed reconnection attempt #{reconnection_count} due to #{e}")
           if reconnection_count > MAX_RECONNECTION_ATTEMPTS
-            Buildkite::TestCollector.logger.error "rspec-buildkite-analytics experienced a disconnection and could not reconnect to Buildkite due to #{e.message}. Please contact support."
+            Buildkite::TestCollector.logger.error "buildkite-test_collector experienced a disconnection and could not reconnect to Buildkite due to #{e.message}. Please contact support."
             raise e
           else
             sleep(WAIT_BETWEEN_RECONNECTIONS)

data/lib/buildkite/test_collector/tracer.rb

@@ -4,6 +4,16 @@ require "active_support/core_ext/hash/indifferent_access"
 
 module Buildkite::TestCollector
   class Tracer
+    # https://github.com/buildkite/test-collector-ruby/issues/131
+    class MonotonicTime
+      GET_TIME = Process.method(:clock_gettime)
+      private_constant :GET_TIME
+
+      def self.call
+        GET_TIME.call Process::CLOCK_MONOTONIC
+      end
+    end
+
     class Span
       attr_accessor :section, :start_at, :end_at, :detail, :children
 
@@ -28,23 +38,23 @@ module Buildkite::TestCollector
     end
 
     def initialize
-      @top = Span.new(:top, Concurrent.monotonic_time, nil, {})
+      @top = Span.new(:top, MonotonicTime.call, nil, {})
       @stack = [@top]
     end
 
     def enter(section, **detail)
-      new_entry = Span.new(section, Concurrent.monotonic_time, nil, detail)
+      new_entry = Span.new(section, MonotonicTime.call, nil, detail)
       current_span.children << new_entry
       @stack << new_entry
     end
 
     def leave
-      current_span.end_at = Concurrent.monotonic_time
+      current_span.end_at = MonotonicTime.call
       @stack.pop
     end
 
     def backfill(section, duration, **detail)
-      new_entry = Span.new(section, Concurrent.monotonic_time - duration, Concurrent.monotonic_time, detail)
+      new_entry = Span.new(section, MonotonicTime.call - duration, MonotonicTime.call, detail)
       current_span.children << new_entry
     end
 
@@ -54,7 +64,7 @@ module Buildkite::TestCollector
 
     def finalize
       raise "Stack not empty" unless @stack.size == 1
-      @top.end_at = Concurrent.monotonic_time
+      @top.end_at = MonotonicTime.call
       self
     end
 

data/lib/buildkite/test_collector/uploader.rb

@@ -57,7 +57,7 @@ module Buildkite::TestCollector
           end
         else
           request_id = response.to_hash["x-request-id"]
-          Buildkite::TestCollector.logger.info "rspec-buildkite-analytics could not establish an initial connection with Buildkite. You may be missing some data for this test suite, please contact support."
+          Buildkite::TestCollector.logger.info "buildkite-test_collector could not establish an initial connection with Buildkite. You may be missing some data for this test suite, please contact support with request ID #{request_id}."
         end
       else
         if !!ENV["BUILDKITE_BUILD_ID"]

data/lib/buildkite/test_collector/version.rb

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

data/lib/buildkite/test_collector.rb

@@ -19,15 +19,13 @@ module Buildkite
       attr_accessor :uploader
       attr_accessor :session
       attr_accessor :debug_enabled
-      attr_accessor :debug_filepath
       attr_accessor :tracing_enabled
     end
 
-    def self.configure(hook:, token: nil, url: nil, debug_enabled: false, debug_filepath: nil, tracing_enabled: true)
-      self.api_token = token || ENV["BUILDKITE_ANALYTICS_TOKEN"]
+    def self.configure(hook:, token: nil, url: nil, debug_enabled: false, tracing_enabled: true)
+      self.api_token = (token || ENV["BUILDKITE_ANALYTICS_TOKEN"])&.strip
       self.url = url || DEFAULT_URL
       self.debug_enabled = debug_enabled || !!(ENV["BUILDKITE_ANALYTICS_DEBUG_ENABLED"])
-      self.debug_filepath = debug_filepath || ENV["BUILDKITE_ANALYTICS_DEBUG_FILEPATH"] || Dir.tmpdir
       self.tracing_enabled = tracing_enabled
 
       self.hook_into(hook)

data/lib/minitest/buildkite_collector_plugin.rb

@@ -1,6 +1,6 @@
 module Minitest
   def self.plugin_buildkite_collector_init(options)
-    if Buildkite::TestCollector.respond_to?(:uploader)
+    if defined?(Buildkite::TestCollector::MinitestPlugin) && Buildkite::TestCollector.respond_to?(:uploader)
       self.reporter << Buildkite::TestCollector::MinitestPlugin::Reporter.new(options[:io], options)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-test_collector
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Buildkite
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport