buildkite-test_collector 2.1.0.pre → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85ba163eccc317f8e03168153e2018d6b3033b760c3479d7e569848dee8be64
-  data.tar.gz: 2ee8f7c0088bd8cf0eff5b94bff12eaf93a5eec5b34e55e25f4bc31d130dbb53
+  metadata.gz: c3f61975dacef343c33cf6d550fc4dd5d765f02050bd2a8bc86b5e221afa751d
+  data.tar.gz: 340dc7bce50ef727dfea08a331260824aaa640c9e83b344bc620afbf153fbe1d
 SHA512:
-  metadata.gz: 302e0420cf87e321faaaa4cf7843d322d1b9589a31411e4e7239c781f6176ab7d2a8ff2c0d3650912bccd0f863946d8815d7f0667e1cf132497b35410dcfa247
-  data.tar.gz: ff0a31165893a7368465be84a8ba8fbc6f863198a3b8d8965cee9941a29b785a6c547eb70cfa6c6e1283d4378970c0e217dfff87b657cc91837736ccf6c7a978
+  metadata.gz: e692ebc6764114d7a70e854c8daf7acd09110ad78736163a2845538451cf5f6b424a709bbccc89007bdccc3e68fac391bb3d9ec041965167c2a709dd6d68ffd5
+  data.tar.gz: 7cb0d8141ebfa1b43c8bc5ae4de82bccbc3da9cb221566a9a54ca7f54b2eba3908be5fa923dc0d08c688fd41d1941f24e711d747ab7d0ecea44be8658f1a2ca8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v2.2.0
+- Gzip payload of request to Upload API #183 - @niceking
+
+## v2.1.0
+- Major change: deprecates websocket connection in favour of sending HTTP requests to the Upload API. In future, websocket support will be completely removed from Buildkite and only version 2.1+ of this gem will continue to work.
+
 ## v2.1.0.pre
 - Minitest plugin to use HTTP Upload API instead of websocket connection to send test data #178 #179 - @niceking
 
@@ -11,7 +17,7 @@
 
 ## v1.5.0
 
-- Send `failure_expanded` from minitest #171 - @nprizal 
+- Send `failure_expanded` from minitest #171 - @nprizal
 
 ## v1.4.2
 

data/DESIGN.md

@@ -2,17 +2,7 @@
 
 ## 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.
+The Buildkite ruby collector uses threads to send data to the Upload API in the background. When the test suite has finished running, the collector waits UPLOAD_SESSION_TIMEOUT seconds for the Upload API requests to finish before exiting.
 
 ## Data
 

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    buildkite-test_collector (2.1.0.pre)
+    buildkite-test_collector (2.2.0)
       activesupport (>= 4.2)
-      websocket (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -34,7 +33,6 @@ GEM
     rspec-support (3.10.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    websocket (1.2.9)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,8 @@
 # Buildkite Collectors for Ruby
 
+**DEPRECATION NOTICE**
+Versions prior to 2.1.x are unsupported and will not work after mid-2023. Please upgrade to the latest version.
+
 Official [Buildkite Test Analytics](https://buildkite.com/test-analytics) collectors for Ruby test frameworks ✨
 
 ⚒ **Supported test frameworks:** RSpec, Minitest, and [more coming soon](https://github.com/buildkite/test-collector-ruby/issues?q=is%3Aissue+is%3Aopen+label%3A%22test+frameworks%22).

data/buildkite-test_collector.gemspec

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

data/buildkite.yaml

@@ -5,4 +5,4 @@ steps:
       - "bundle exec rake"
     plugins:
       - docker#v3.7.0:
-          image: ruby:latest
+          image: 445615400570.dkr.ecr.us-east-1.amazonaws.com/ecr-public/docker/library/ruby:3.1.4

data/lib/buildkite/test_collector/http_client.rb

@@ -10,24 +10,6 @@ module Buildkite::TestCollector
       @authorization_header = "Token token=\"#{Buildkite::TestCollector.api_token}\""
     end
 
-    def post
-      contact_uri = URI.parse(url)
-
-      http = Net::HTTP.new(contact_uri.host, contact_uri.port)
-      http.use_ssl = contact_uri.scheme == "https"
-
-      contact = Net::HTTP::Post.new(contact_uri.path, {
-        "Authorization" => authorization_header,
-        "Content-Type" => "application/json",
-      })
-      contact.body = {
-        run_env: Buildkite::TestCollector::CI.env,
-        format: "websocket"
-      }.to_json
-
-      http.request(contact)
-    end
-
     def post_json(data)
       contact_uri = URI.parse(url)
 
@@ -37,16 +19,25 @@ module Buildkite::TestCollector
       contact = Net::HTTP::Post.new(contact_uri.path, {
         "Authorization" => authorization_header,
         "Content-Type" => "application/json",
+        "Content-Encoding" => "gzip",
       })
 
       data_set = data.map(&:as_hash)
 
-      contact.body = {
+      body = {
         run_env: Buildkite::TestCollector::CI.env,
         format: "json",
         data: data_set
       }.to_json
 
+      compressed_body = StringIO.new
+
+      writer = Zlib::GzipWriter.new(compressed_body)
+      writer.write(body)
+      writer.close
+
+      contact.body = compressed_body.string
+
       http.request(contact)
     end
 

data/lib/buildkite/test_collector/version.rb

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

data/lib/buildkite/test_collector.rb

@@ -8,13 +8,10 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-test_collector
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre
+  version: 2.2.0
 platform: ruby
 authors:
 - Buildkite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -123,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: