buildkite-test_collector 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f61975dacef343c33cf6d550fc4dd5d765f02050bd2a8bc86b5e221afa751d
-  data.tar.gz: 340dc7bce50ef727dfea08a331260824aaa640c9e83b344bc620afbf153fbe1d
+  metadata.gz: cecd9e001e4e3ead60507d46635e48fbe2468c183e215896ae4c92e69d207aee
+  data.tar.gz: da88dde37e16f1ef279f05f84434fdefe1edc8488e864b669cba0741cc0799ca
 SHA512:
-  metadata.gz: e692ebc6764114d7a70e854c8daf7acd09110ad78736163a2845538451cf5f6b424a709bbccc89007bdccc3e68fac391bb3d9ec041965167c2a709dd6d68ffd5
-  data.tar.gz: 7cb0d8141ebfa1b43c8bc5ae4de82bccbc3da9cb221566a9a54ca7f54b2eba3908be5fa923dc0d08c688fd41d1941f24e711d747ab7d0ecea44be8658f1a2ca8
+  metadata.gz: 7d8a965f5a1897a0ddce0ac3a03a527fbfb8d2683ce9555961ef1ba597742e7070cdd187d48f97b8e3111769e837eca69e1b65b52708515b7c87357811bc2c8f
+  data.tar.gz: 00caaf80206b97b39d4f4f0e67c15e1b8b77ee5f7df85f74b4a569bff3cb0ec1e4f2a248eda5c0d302277e0fe44421c52a32d65e114d162334971af9fad03e75

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v2.3.0
+- Stop sending execution id and safeguard SecureRandom.uuid #192 - @niceking
+- Rescue from StandardError when sending upload request #191 - @niceking
+- Fix nil pointer #188 - @ChrisBr
+
 ## v2.2.0
 - Gzip payload of request to Upload API #183 - @niceking
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildkite-test_collector (2.2.0)
+    buildkite-test_collector (2.3.0)
       activesupport (>= 4.2)
 
 GEM
@@ -14,7 +14,7 @@ GEM
       tzinfo (~> 2.0)
     concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     minitest (5.18.0)
     rake (13.0.6)

data/lib/buildkite/test_collector/ci.rb

@@ -21,7 +21,7 @@ class Buildkite::TestCollector::CI
 
     {
       "CI" => nil,
-      "key" => SecureRandom.uuid,
+      "key" => Buildkite::TestCollector::UUID.call,
     }
   end
 
@@ -44,7 +44,7 @@ class Buildkite::TestCollector::CI
   def generic
     {
       "CI" => "generic",
-      "key" => SecureRandom.uuid,
+      "key" => Buildkite::TestCollector::UUID.call,
     }
   end
 

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

@@ -30,7 +30,7 @@ RSpec.configure do |config|
 
   config.after(:suite) do
     if Buildkite::TestCollector.artifact_path
-      filename = File.join(Buildkite::TestCollector.artifact_path, "buildkite-test-collector-rspec-#{SecureRandom.uuid}.json.gz")
+      filename = File.join(Buildkite::TestCollector.artifact_path, "buildkite-test-collector-rspec-#{Buildkite::TestCollector::UUID.call}.json.gz")
       data_set = { results: Buildkite::TestCollector.uploader.traces.values.map(&:as_hash) }
       File.open(filename, "wb") do |f|
         gz = Zlib::GzipWriter.new(f)

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

@@ -21,8 +21,10 @@ module Buildkite::TestCollector::MinitestPlugin
     def report
       super
 
-      Buildkite::TestCollector.session.send_remaining_data
-      Buildkite::TestCollector.session.close
+      if Buildkite::TestCollector.session
+        Buildkite::TestCollector.session.send_remaining_data
+        Buildkite::TestCollector.session.close
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Buildkite::TestCollector::MinitestPlugin
   class Trace
     attr_accessor :example
     attr_writer :failure_reason, :failure_expanded
-    attr_reader :id, :history
+    attr_reader :history
 
     RESULT_CODES = {
       '.' => 'passed',
@@ -16,7 +16,6 @@ module Buildkite::TestCollector::MinitestPlugin
     FILE_PATH_REGEX = /^(.*?\.(rb|feature))/
 
     def initialize(example, history:)
-      @id = SecureRandom.uuid
       @example = example
       @history = history
     end
@@ -31,7 +30,6 @@ module Buildkite::TestCollector::MinitestPlugin
 
     def as_hash
       strip_invalid_utf8_chars(
-        id: id,
         scope: example.class.name,
         name: example.name,
         location: location,

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

@@ -3,12 +3,11 @@
 module Buildkite::TestCollector::RSpecPlugin
   class Trace
     attr_accessor :example, :failure_reason, :failure_expanded
-    attr_reader :id, :history
+    attr_reader :history
 
     FILE_PATH_REGEX = /^(.*?\.(rb|feature))/
 
     def initialize(example, history:, failure_reason: nil, failure_expanded: [])
-      @id = SecureRandom.uuid
       @example = example
       @history = history
       @failure_reason = failure_reason
@@ -25,7 +24,6 @@ module Buildkite::TestCollector::RSpecPlugin
 
     def as_hash
       strip_invalid_utf8_chars(
-        id: id,
         scope: example.example_group.metadata[:full_description],
         name: example.description,
         location: example.location,

data/lib/buildkite/test_collector/uploader.rb

@@ -24,7 +24,8 @@ module Buildkite::TestCollector
       Net::OpenTimeout,
       OpenSSL::SSL::SSLError,
       OpenSSL::SSL::SSLErrorWaitReadable,
-      EOFError
+      EOFError,
+      Errno::ETIMEDOUT
     ]
 
     def self.tracer
@@ -44,6 +45,8 @@ module Buildkite::TestCollector
           if (upload_attempts += 1) < MAX_UPLOAD_ATTEMPTS
             retry
           end
+        rescue StandardError => e
+          $stderr.puts "#{Buildkite::TestCollector::NAME} #{Buildkite::TestCollector::VERSION} experienced an error when sending your data, you may be missing some executions for this run."
         end
       end
     end

data/lib/buildkite/test_collector/uuid.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "securerandom"
+
+class Buildkite::TestCollector::UUID
+  GET_UUID = SecureRandom.method(:uuid)
+  private_constant :GET_UUID
+
+  def self.call
+    GET_UUID.call
+  end
+end

data/lib/buildkite/test_collector/version.rb

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

data/lib/buildkite/test_collector.rb

@@ -11,7 +11,6 @@ require "net/http"
 require "time"
 require "timeout"
 require "tmpdir"
-require "securerandom"
 
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/hash/indifferent_access"
@@ -26,6 +25,7 @@ require_relative "test_collector/network"
 require_relative "test_collector/object"
 require_relative "test_collector/tracer"
 require_relative "test_collector/session"
+require_relative "test_collector/uuid"
 
 module Buildkite
   module TestCollector

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-test_collector
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Buildkite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,6 +90,7 @@ files:
 - lib/buildkite/test_collector/session.rb
 - lib/buildkite/test_collector/tracer.rb
 - lib/buildkite/test_collector/uploader.rb
+- lib/buildkite/test_collector/uuid.rb
 - lib/buildkite/test_collector/version.rb
 - lib/minitest/buildkite_collector_plugin.rb
 homepage: https://github.com/buildkite/test-collector-ruby