buildkite-test_collector 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1b8d87ace52bb67aa1b58a9c4312fbb067ce244ab56c505acdbd8a8f4f914c
-  data.tar.gz: dd5a2cd67e8d3765f04bec6b204485de15fc55c9d9b76f21940f100517636177
+  metadata.gz: '09168f300d0d7fe87764a70906ac21693f9de504b68ac9cc547e42481d370173'
+  data.tar.gz: 3daa78abca6baab5cf000a01e1e49e699c02575ad7c10d4ac0d3aae9d0a760ef
 SHA512:
-  metadata.gz: 73f95180c00f9e5ef767da6266ab391020b43707b666cb04c948b6b0fba4f3c68d9e37a7c023d3f508f7ae70ae219224c3145cc47e071ce77155d9bdb86e8dbe
-  data.tar.gz: 8de30643055606915e936f1e41adf06f619394577cbd01e24dc074877672af29ca93b1020dafffa0635b97ee5c508b47da004387660b58fe15ee9da1f49ad9dc
+  metadata.gz: dbe1aa57f2b575a339bc2af259bdac5f73e98075b75de6dfb711f97262ea90c10284f06792e49e88462405bacc8e916fd5b6e0f138a073e4db9569cf147c5ca0
+  data.tar.gz: 49e27c93a9e23c4d6d38384f2a1dbe1be93d88b7e86a19b462fe942041bbac8da4e3adb47b9482f6741ed7faf96850ef4990e4733ecc21ee3f077c15d6c6176b

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## v1.1.2
+
+- Remove branch reference prefix in Github Actions #136 - @gchan
+- Make ruby collector work better for non-web app #128 - @JuanitoFatas
+- Avoid linters complaining about double quotes #137 - @SocalNick
+- Revert "Allow specifying run name prefix and suffix" #139 - @JuanitoFatas
+- Update Code of Conduct contact email address #143 - @JuanitoFatas
+- Suppress errors when connecting to Buildkite #145 - @swebb
+- Add some design documentation to understand how the gem works #146 - @swebb
+- Fix logging level from debug to error #147 - @gchan
+
+## 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/CODE_OF_CONDUCT.md

@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-`support+analytics@buildkite.com`.
+[coc@buildkite.com](mailto:coc@buildkite.com).
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

data/DESIGN.md

@@ -0,0 +1,19 @@
+# Design
+
+## Threads
+
+The Buildkite ruby collector uses websockets and ActionCable to send and
+receive data with Buildkite. Execution information starts transmitting as soon
+as possible, without waiting for the test suite to finish running.
+
+This gem uses 3 ruby threads:
+
+* main thread: acts as the producer. It collects span data from the
+  test suite and enqueues it into the send queue.
+* write thread: acts as the consumer. Removes data from the send queue and
+  sends it to Buildkite.
+* read thread: receives and processes messages from Buildkite.
+
+## Data
+
+Trace data is stored in spans. See [Buildkite::TestCollector::Tracer](lib/buildkite/test_collector/tracer.rb) for more information.

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/README.md

@@ -22,7 +22,7 @@ Or add this to your Gemfile’s test group:
 
 ```ruby
 group :test do
-  gem "buildkite-test_collector"
+  gem 'buildkite-test_collector'
 end
 ```
 
@@ -34,7 +34,7 @@ Add the following code to your RSpec setup file:
 
 ```ruby
 # spec/spec_helper.rb
-require "buildkite/test_collector"
+require 'buildkite/test_collector'
 Buildkite::TestCollector.configure(hook: :rspec)
 ```
 
@@ -50,7 +50,7 @@ Add the following code to your Minitest setup file:
 
 ```ruby
 # test/test_helper.rb
-require "buildkite/test_collector"
+require 'buildkite/test_collector'
 Buildkite::TestCollector.configure(hook: :minitest)
 ```
 
@@ -94,6 +94,8 @@ bundle exec rspec
 
 Useful resources for developing collectors include the [Buildkite Test Analytics docs](https://buildkite.com/docs/test-analytics).
 
+See [DESIGN.md](DESIGN.md) for an overview of the design of this gem.
+
 ## 👩‍💻 Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/buildkite/test-collector-ruby

data/lib/buildkite/test_collector/ci.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "securerandom"
-
 class Buildkite::TestCollector::CI
   def self.env
     new.env
@@ -67,7 +65,7 @@ class Buildkite::TestCollector::CI
       "CI" => "github_actions",
       "key" => "#{ENV["GITHUB_ACTION"]}-#{ENV["GITHUB_RUN_NUMBER"]}-#{ENV["GITHUB_RUN_ATTEMPT"]}",
       "url" => File.join("https://github.com", ENV["GITHUB_REPOSITORY"], "actions/runs", ENV["GITHUB_RUN_ID"]),
-      "branch" => ENV["GITHUB_REF"],
+      "branch" => ENV["GITHUB_REF_NAME"],
       "commit_sha" => ENV["GITHUB_SHA"],
       "number" => ENV["GITHUB_RUN_NUMBER"],
     }

data/lib/buildkite/test_collector/error.rb

@@ -0,0 +1,4 @@
+module Buildkite::TestCollector
+  class Error < StandardError; end
+  class TimeoutError < ::Timeout::Error; end
+end

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

@@ -2,15 +2,14 @@
 
 require "minitest"
 
-require_relative "../uploader"
 require_relative "../minitest_plugin"
 
 Buildkite::TestCollector.uploader = Buildkite::TestCollector::Uploader
 
-class MiniTest::Test
+class Minitest::Test
   include Buildkite::TestCollector::MinitestPlugin
 end
 
 Buildkite::TestCollector.enable_tracing!
 
-Buildkite::TestCollector::Uploader.configure
+Buildkite::TestCollector.safe { Buildkite::TestCollector::Uploader.configure }

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

@@ -3,7 +3,6 @@
 require "rspec/core"
 require "rspec/expectations"
 
-require_relative "../uploader"
 require_relative "../rspec_plugin/reporter"
 require_relative "../rspec_plugin/trace"
 
@@ -13,7 +12,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     config.add_formatter Buildkite::TestCollector::RSpecPlugin::Reporter
 
-    Buildkite::TestCollector::Uploader.configure
+    Buildkite::TestCollector.safe { Buildkite::TestCollector::Uploader.configure }
   end
 
   config.around(:each) do |example|

data/lib/buildkite/test_collector/logger.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "logger"
-require "time"
-
 module Buildkite::TestCollector
   class Logger < ::Logger
     class Formatter < ::Logger::Formatter

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

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Minitest finds this file before setup code
+require_relative "tracer"
+
 require_relative "minitest_plugin/reporter"
 require_relative "minitest_plugin/trace"
 
@@ -12,9 +15,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 +24,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/rspec_plugin/reporter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "time"
-
 module Buildkite::TestCollector::RSpecPlugin
   class Reporter
     RSpec::Core::Formatters.register self, :example_passed, :example_failed, :example_pending, :dump_summary

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/hash/indifferent_access"
-
 module Buildkite::TestCollector::RSpecPlugin
   class Trace
     attr_accessor :example, :failure_reason, :failure_expanded

data/lib/buildkite/test_collector/session.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "socket_connection"
-
 module Buildkite::TestCollector
   class Session
     # Picked 75 as the magic timeout number as it's longer than the TCP timeout of 60s 🤷‍♀️
@@ -13,11 +11,11 @@ module Buildkite::TestCollector
     class InitialConnectionFailure < StandardError; end
 
     DISCONNECTED_EXCEPTIONS = [
-      SocketConnection::HandshakeError,
+      Buildkite::TestCollector::SocketConnection::HandshakeError,
+      Buildkite::TestCollector::TimeoutError,
+      Buildkite::TestCollector::SocketConnection::SocketError,
       RejectedSubscription,
-      TimeoutError,
       InitialConnectionFailure,
-      SocketConnection::SocketError
     ]
 
     def initialize(url, authorization_header, channel)
@@ -41,10 +39,10 @@ module Buildkite::TestCollector
       begin
         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}...")
+      rescue Buildkite::TestCollector::TimeoutError, InitialConnectionFailure => e
+        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 +75,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/socket_connection.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "socket"
-require "openssl"
-require "json"
-
 module Buildkite::TestCollector
   class SocketConnection
     class HandshakeError < StandardError; end
@@ -65,7 +61,7 @@ module Buildkite::TestCollector
 
       # Setting up a new thread that listens on the socket, and processes incoming
       # comms from the server
-      @thread = Thread.new do
+      @read_thread = Thread.new do
         Buildkite::TestCollector.logger.debug("listening in on socket")
         frame = WebSocket::Frame::Incoming::Client.new
 
@@ -82,7 +78,7 @@ module Buildkite::TestCollector
       rescue EOFError => e
         Buildkite::TestCollector.logger.warn("#{e}")
         if @socket
-          Buildkite::TestCollector.logger.warn("attempting disconnected flow")
+          Buildkite::TestCollector.logger.error("attempting disconnected flow")
           @session.disconnected(self)
           disconnect
         end
@@ -151,7 +147,7 @@ module Buildkite::TestCollector
       socket = @socket
       @socket = nil
       socket&.close
-      @thread&.join unless @thread == Thread.current
+      @read_thread&.join unless @read_thread == Thread.current
     end
   end
 end

data/lib/buildkite/test_collector/tracer.rb

@@ -1,9 +1,29 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/hash/indifferent_access"
-
 module Buildkite::TestCollector
+  # Traces the execution of an application by creating and storing spans of information.
+  #
+  # This class contains two data structures:
+  #
+  # - A stack (called @stack) that traces the entering & leaving of each part of the application.
+  # - A tree made up of many Span nodes. Each Span is a node in the tree. Each
+  #   span is also stored in the stack. The root of the tree is called @top and
+  #   is stored at @stack[0].
+  #
+  # When the trace is complete the stack MUST contain a single node @top, which
+  # is the root of the tree (see #finalize). The tree is converted into a hash
+  # in #as_json which recursively calls #as_json on all of it's children.
   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 +48,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 +74,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

@@ -1,20 +1,5 @@
 # frozen_string_literal: true
 
-require "openssl"
-require "websocket"
-
-require_relative "tracer"
-require_relative "network"
-require_relative "object"
-require_relative "session"
-require_relative "ci"
-require_relative "http_client"
-
-require "active_support"
-require "active_support/notifications"
-
-require "securerandom"
-
 module Buildkite::TestCollector
   class Uploader
     def self.traces
@@ -57,7 +42,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.2"
     NAME = "buildkite-test_collector"
   end
 end

data/lib/buildkite/test_collector.rb

@@ -1,16 +1,39 @@
 # frozen_string_literal: true
 
+module Buildkite
+  module TestCollector
+  end
+end
+
+require "json"
+require "logger"
+require "net/http"
+require "openssl"
+require "time"
 require "timeout"
 require "tmpdir"
+require "securerandom"
+require "socket"
+require "websocket"
+
+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/logger"
+require_relative "test_collector/ci"
+require_relative "test_collector/http_client"
+require_relative "test_collector/uploader"
+require_relative "test_collector/network"
+require_relative "test_collector/object"
+require_relative "test_collector/tracer"
+require_relative "test_collector/socket_connection"
+require_relative "test_collector/session"
 
 module Buildkite
   module TestCollector
-    class Error < StandardError; end
-    class TimeoutError < ::Timeout::Error; end
-
     DEFAULT_URL = "https://analytics-api.buildkite.com/v1/uploads"
 
     class << self
@@ -19,15 +42,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)
@@ -80,5 +101,12 @@ module Buildkite
         Buildkite::TestCollector::Uploader.tracer&.backfill(:sql, finish - start, **{ query: payload[:sql] })
       end
     end
+
+    def self.safe(&block)
+      block.call
+    rescue StandardError => e
+      logger.error("Buildkite::TestCollector received exception: #{e}")
+      logger.error("Backtrace:\n#{e.backtrace.join("\n")}")
+    end
   end
 end

data/lib/minitest/buildkite_collector_plugin.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
+# Minitest finds this file before setup code
+require_relative "../buildkite/test_collector"
+require_relative "../buildkite/test_collector/minitest_plugin/reporter"
+
 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.2
 platform: ruby
 authors:
 - Buildkite
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,7 @@ files:
 - CHANGELOG.md
 - CODEOWNERS
 - CODE_OF_CONDUCT.md
+- DESIGN.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -95,6 +96,7 @@ files:
 - buildkite.yaml
 - lib/buildkite/test_collector.rb
 - lib/buildkite/test_collector/ci.rb
+- lib/buildkite/test_collector/error.rb
 - lib/buildkite/test_collector/http_client.rb
 - lib/buildkite/test_collector/library_hooks/minitest.rb
 - lib/buildkite/test_collector/library_hooks/rspec.rb
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Track test executions and report to Buildkite Test Analytics