bugsnag-maze-runner 7.33.1 → 8.0.0

data/lib/features/steps/trace_steps.rb

@@ -7,14 +7,6 @@ When('I wait for {int} span(s)') do |span_count|
   assert_received_spans span_count, Maze::Server.list_for('traces')
 end
 
-When('I receive and discard the initial p-value request') do
-  steps %Q{
-    And I wait to receive at least 1 trace
-    And the trace payload field "resourceSpans" is an array with 0 elements
-    And I discard the oldest trace
-  }
-end
-
 Then('I should have received no spans') do
   sleep Maze.config.receive_no_requests_wait
   Maze.check.equal spans_from_request_list(Maze::Server.list_for('traces')).size, 0

data/lib/features/steps/value_steps.rb

@@ -7,7 +7,7 @@ require 'date'
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to store
 # @step_input key [String] The key to store the value against
-Then('the {word} payload field {string} is stored as the value {string}') do |request_type, field, key|
+Then('the {request_type} payload field {string} is stored as the value {string}') do |request_type, field, key|
   list = Maze::Server.list_for request_type
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze::Store.values[key] = value.dup
@@ -18,7 +18,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
 # @step_input key [String] The key indicating a previously stored value
-Then('the {word} payload field {string} equals the stored value {string}') do |request_type, field, key|
+Then('the {request_type} payload field {string} equals the stored value {string}') do |request_type, field, key|
   list = Maze::Server.list_for request_type
   payload_value = Maze::Helper.read_key_path(list.current[:body], field)
   stored_value = Maze::Store.values[key]
@@ -31,7 +31,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
 # @step_input key [String] The key indicating a previously stored value
-Then('the {word} payload field {string} does not equal the stored value {string}') do |request_type, field, key|
+Then('the {request_type} payload field {string} does not equal the stored value {string}') do |request_type, field, key|
   list = Maze::Server.list_for request_type
   payload_value = Maze::Helper.read_key_path(list.current[:body], field)
   stored_value = Maze::Store.values[key]
@@ -44,7 +44,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
 # @step_input key [String] The key indicating a previously stored value
-Then('the {word} payload field {string} equals the stored value {string} ignoring case') do |request_type, field, key|
+Then('the {request_type} payload field {string} equals the stored value {string} ignoring case') do |request_type, field, key|
   list = Maze::Server.list_for request_type
   payload_value = Maze::Helper.read_key_path(list.current[:body], field)
   stored_value = Maze::Store.values[key]
@@ -59,7 +59,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
 # @step_input key [String] The key indicating a previously stored value
-Then('the {word} payload field {string} does not equal the stored value {string} ignoring case') do |request_type, field, key|
+Then('the {request_type} payload field {string} does not equal the stored value {string} ignoring case') do |request_type, field, key|
   list = Maze::Server.list_for request_type
   payload_value = Maze::Helper.read_key_path(list.current[:body], field)
   stored_value = Maze::Store.values[key]
@@ -73,7 +73,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
-Then('the {word} payload field {string} is a number') do |request_type, field|
+Then('the {request_type} payload field {string} is a number') do |request_type, field|
   list = Maze::Server.list_for request_type
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze.check.kind_of Numeric, value
@@ -83,7 +83,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
-Then('the {word} payload field {string} is an integer') do |request_type, field|
+Then('the {request_type} payload field {string} is an integer') do |request_type, field|
   list = Maze::Server.list_for request_type
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze.check.kind_of Integer, value
@@ -93,7 +93,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
-Then('the {word} payload field {string} is a date') do |request_type, field|
+Then('the {request_type} payload field {string} is a date') do |request_type, field|
   list = Maze::Server.list_for request_type
   value = Maze::Helper.read_key_path(list.current[:body], field)
   date = begin
@@ -108,7 +108,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload field to test
-Then('the {word} payload field {string} is a UUID') do |request_type, field|
+Then('the {request_type} payload field {string} is a UUID') do |request_type, field|
   list = Maze::Server.list_for request_type
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze.check.not_nil(value, "Expected UUID, got nil for #{field}")

data/lib/features/support/cucumber_types.rb

@@ -0,0 +1,20 @@
+ParameterType(
+  name:        'request_type',
+  regexp:      /errors?|sessions?|builds?|logs?|metrics?|sampling requests?|traces?|uploads?|sourcemaps?|invalid requests?/,
+  type:        String,
+  transformer: ->(s) { s }
+)
+
+ParameterType(
+  name:        'orientation',
+  regexp:      /portrait|landscape/,
+  type:        String,
+  transformer: ->(s) { s.to_sym }
+)
+
+ParameterType(
+  name:        'int_array',
+  regexp:      /\d+(?:, ?\d+)*/,
+  type:        String,
+  transformer: ->(s) { s.split(',').map(&:strip).map(&:to_i) }
+)

data/lib/features/support/internal_hooks.rb

@@ -90,8 +90,6 @@ InstallPlugin do |config|
   # Only add the retry plugin if --retry is not used on the command line
   config.filters << Maze::Plugins::GlobalRetryPlugin.new(config) if config.options[:retry].zero?
   config.filters << Maze::Plugins::BugsnagReportingPlugin.new(config)
-  cucumber_report_plugin = Maze::Plugins::CucumberReportPlugin.new
-  cucumber_report_plugin.install_plugin(config)
 end
 
 # Before each scenario

data/lib/maze/api/appium/file_manager.rb

@@ -20,7 +20,7 @@ module Maze
                    "/sdcard/Android/data/#{@driver.app_id}/files/#{filename}"
                  end
 
-          $logger.debug "Pushing file to '#{path}' with contents: #{contents}"
+          $logger.trace "Pushing file to '#{path}' with contents: #{contents}"
           @driver.push_file(path, contents)
         end
       end

data/lib/maze/appium_server.rb

@@ -44,7 +44,7 @@ module Maze
         @appium_thread = Thread.new do
           PTY.spawn(command) do |stdout, _stdin, pid|
             @pid = pid
-            $logger.debug("Appium:#{@pid}") { 'Appium server started' }
+            $logger.trace("Appium:#{@pid}") { 'Appium server started' }
             stdout.each do |line|
               log_line(line)
             end
@@ -66,7 +66,7 @@ module Maze
       def stop
         return unless running
 
-        $logger.debug("Appium:#{@pid}") { 'Stopping appium server' }
+        $logger.trace("Appium:#{@pid}") { 'Stopping appium server' }
         Process.kill('INT', @pid)
         @pid = nil
         @appium_thread.join

data/lib/maze/client/appium/bb_client.rb

@@ -29,7 +29,7 @@ module Maze
           prefix = BitBarDevices.caps_prefix(config.appium_version)
           capabilities = {
             "#{prefix}noReset" => true,
-            "#{prefix}newCommandTimeout" => 600,
+            "#{prefix}newCommandTimeout" => 0,
             'bitbar:options' => {
               # Some capabilities probably belong in the top level
               # of the hash, but BitBar picks them up from here.

data/lib/maze/client/appium/bb_devices.rb

@@ -17,7 +17,7 @@ module Maze
             device_group_ids = api_client.get_device_group_ids(device_or_group_names)
             if device_group_ids
               # Device group found - find a free device in it
-              $logger.debug "Got group ids #{device_group_ids} for #{device_or_group_names}"
+              $logger.trace "Got group ids #{device_group_ids} for #{device_or_group_names}"
               group_count, device = api_client.find_device_in_groups(device_group_ids)
               if device.nil?
                 # TODO: Retry rather than fail, see PLAT-7377

data/lib/maze/client/appium/bs_devices.rb

@@ -70,15 +70,13 @@ module Maze
           def create_hash
             hash = {
               # Classic, non-specific devices for each Android version
-              'ANDROID_13_0' => make_android_hash('Google Pixel 6 Pro', '13.0'),
-              'ANDROID_13_0_BETA' => make_android_hash('Google Pixel 6 Pro', '13 Beta'),
-              'ANDROID_12_0' => make_android_hash('Google Pixel 5', '12.0'),
-              'ANDROID_11_0' => make_android_hash('Google Pixel 4', '11.0'),
-              'ANDROID_10_0' => make_android_hash('Google Pixel 4', '10.0'),
-              'ANDROID_9_0' => make_android_hash('Google Pixel 3', '9.0'),
-              'ANDROID_8_1' => make_android_hash('Samsung Galaxy Note 9', '8.1'),
-              'ANDROID_8_0' => make_android_hash('Google Pixel 2', '8.0'),
-              'ANDROID_7_1' => make_android_hash('Google Pixel', '7.1'),
+              'ANDROID_13' => make_android_hash('Google Pixel 6 Pro', '13.0'),
+              'ANDROID_12' => make_android_hash('Google Pixel 5', '12.0'),
+              'ANDROID_11' => make_android_hash('Google Pixel 4', '11.0'),
+              'ANDROID_10' => make_android_hash('Google Pixel 4', '10.0'),
+              'ANDROID_9' => make_android_hash('Google Pixel 3', '9.0'),
+              'ANDROID_8' => make_android_hash('Samsung Galaxy Note 9', '8.1'),
+              'ANDROID_7' => make_android_hash('Google Pixel', '7.1'),
 
               # iOS devices
               'IOS_16' => make_ios_hash('iPhone 14', '16'),

data/lib/maze/client/bb_api_client.rb

@@ -44,7 +44,7 @@ module Maze
           all_devices += query_api(path, query)['data']
         end
 
-        $logger.debug "All available devices in group(s) #{device_group_ids}: #{JSON.pretty_generate(all_devices)}"
+        $logger.trace "All available devices in group(s) #{device_group_ids}: #{JSON.pretty_generate(all_devices)}"
         filtered_devices = all_devices.reject { |device| device['locked'] }
 
         # Only send gauges to DataDog for single device groups
@@ -64,7 +64,7 @@ module Maze
         if all_devices.size == 0
           Maze::Helper.error_exit "No devices found with name '#{device_name}'"
         else
-          $logger.debug "All available devices with name #{device_name}: #{JSON.pretty_generate(all_devices)}"
+          $logger.trace "All available devices with name #{device_name}: #{JSON.pretty_generate(all_devices)}"
           filtered_devices = all_devices.reject { |device| device['locked'] }
           if filtered_devices.size == 0
             Maze::Helper.error_exit "None of the #{all_devices.size} devices with name '#{device_name}' are currently available"
@@ -88,23 +88,60 @@ module Maze
         end
       end
 
+      def get_projects(pattern)
+        query = {
+          'limit': "1000"
+        }
+
+        project_data = query_api('projects', query)
+
+        begin
+          projects = Hash.new
+          project_data['data'].each do |child|
+            if child['name'].match(pattern)
+              projects[child['name']] = child['id']
+            end
+          end
+        rescue StandardError => e
+          $logger.error "Error getting projects from BitBar"
+          $logger.error e
+          raise
+        end
+        projects
+      end
+
+      def delete_project (id)
+        response = query_api "projects/#{id}"
+      end
+
       private
 
       # Queries the BitBar REST API
-      def query_api(path, query=nil, uri=USER_SPECIFIC_URI)
+      def query_api(path, query=nil, uri=USER_SPECIFIC_URI, method="get")
         if query
           encoded_query = URI.encode_www_form(query)
           uri = URI("#{uri}/#{path}?#{encoded_query}")
         else
           uri = URI("#{uri}/#{path}")
         end
-        request = Net::HTTP::Get.new(uri)
-        request.basic_auth(@access_key, '')
-        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-          http.request(request)
-        end
 
-        JSON.parse(res.body)
+        if method == "get"
+          request = Net::HTTP::Get.new(uri)
+          request.basic_auth(@access_key, '')
+          res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(request)
+          end
+
+          return JSON.parse(res.body)
+        elsif method == "delete"
+          request = Net::HTTP::Delete.new(uri)
+          request.basic_auth(@access_key, '')
+          res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(request)
+          end
+
+          return res
+        end
       end
     end
   end

data/lib/maze/client/bb_client_utils.rb

@@ -63,66 +63,6 @@ module Maze
           app_uuid
         end
 
-        # Requests an unused account id from the test-management-service
-        # @param tms_uri [String] The URI of the test-management-service
-        #
-        # @returns
-        def account_credentials(tms_uri)
-          interval_seconds = 10
-
-          credentials = Maze::Wait.new(interval: interval_seconds, timeout: 1800).until do
-            output = request_account_index(tms_uri)
-            case output.code
-            when '200'
-              body = JSON.parse(output.body, {symbolize_names: true})
-              @account_id = account_id = body[:id]
-              $logger.info "Using account #{account_id}, expiring at #{body[:expiry]}"
-              {
-                username: ENV["#{BB_USER_PREFIX}#{account_id}"],
-                access_key: ENV["#{BB_KEY_PREFIX}#{account_id}"]
-              }
-            when '409'
-              # All accounts are in use, wait for one to become available
-              $logger.info("All accounts are currently in use, retrying in #{interval_seconds}s")
-              false
-            else
-              # Something has gone wrong, throw an error
-              $logger.error "Unexpected status code (#{output.code}) received from test-management server: #{output.body}"
-              raise
-            end
-          end
-
-          return credentials if credentials
-
-          raise "Could not fetch BitBar credentials in time"
-        end
-
-        # Makes the HTTP call to acquire an account id
-        # @param tms_uri [String] The URI of the test-management-service
-        #
-        # @returns
-        def request_account_index(tms_uri)
-          uri = URI("#{tms_uri}/account/request")
-          request = Net::HTTP::Get.new(uri)
-          request['Authorization'] = Maze.config.tms_token
-          res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-            http.request(request)
-          end
-          res
-        end
-
-        # Informs the test-management-service that in-use account id is no longer in use
-        # @param tms_uri [String] The URI of the test-management-service
-        def release_account(tms_uri)
-          $logger.info "Release account #{@account_id}"
-          uri = URI("#{tms_uri}/account/release?account_id=#{@account_id}")
-          request = Net::HTTP::Get.new(uri)
-          request['Authorization'] = Maze.config.tms_token
-          res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-            http.request(request)
-          end
-        end
-
         def use_local_tunnel?
           Maze.config.start_tunnel && !Maze.config.aws_public_ip
         end
@@ -225,7 +165,7 @@ module Maze
               end
 
               exit_status = wait_thr.value.to_i
-              $logger.debug "Exit status: #{exit_status}"
+              $logger.trace "Exit status: #{exit_status}"
 
               output.each { |line| $logger.warn('SBSecureTunnel') {line.chomp} } unless exit_status == 0
 

data/lib/maze/client/selenium/bb_client.rb

@@ -13,11 +13,7 @@ module Maze
           config.capabilities = capabilities
 
           if Maze::Client::BitBarClientUtils.use_local_tunnel?
-            if ENV['BUILDKITE']
-              credentials = Maze::Client::BitBarClientUtils.account_credentials config.tms_uri
-              capabilities['bitbar_apiKey'] = credentials[:access_key]
-            end
-
+            capabilities['bitbar_apiKey'] = config.access_key
             Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
                                                                config.username,
                                                                config.access_key
@@ -41,7 +37,6 @@ module Maze
           super
           if Maze::Client::BitBarClientUtils.use_local_tunnel?
             Maze::Client::BitBarClientUtils.stop_local_tunnel
-            Maze::Client::BitBarClientUtils.release_account(Maze.config.tms_uri) if ENV['BUILDKITE']
           end
         end
       end

data/lib/maze/client/selenium/bs_browsers.yml

@@ -96,77 +96,77 @@ safari_16:
   os: "OS X"
   osVersion: "Ventura"
 
-iphone_6s:
+ios_9:
   browserName: "iphone"
   device: "iPhone 6S"
   os: "ios"
   osVersion: "9.0"
   realMobile: true
 
-iphone_7:
+ios_10:
   browserName: "iphone"
   device: "iPhone 7"
   os: "ios"
   osVersion: "10.3"
   realMobile: true
 
-iphone_x:
+ios_11:
   browserName: "iphone"
   device: "iPhone X"
   os: "ios"
   osVersion: "11"
   realMobile: true
 
-iphone_xs:
+ios_12:
   browserName: "iphone"
   device: "iPhone XS"
   os: "ios"
   osVersion: "12"
   realMobile: true
 
-iphone_13:
+ios_15:
   browserName: "iphone"
   device: "iPhone 13"
   os: "ios"
   osVersion: "15.4"
   realMobile: true
 
-iphone_14:
+ios_16:
   browserName: "iphone"
   device: "iPhone 14"
   os: "ios"
   osVersion: "16"
   realMobile: true
 
-android_nexus5:
+android_4:
   browserName: "Android Browser"
   device: "Google Nexus 5"
   os: "android"
   osVersion: "4.4"
   realMobile: true
 
-android_s6:
+android_5:
   browserName: "Android Browser"
   device: "Samsung Galaxy S6"
   os: "android"
   osVersion: "5.0"
   realMobile: true
 
-android_s7:
+android_6:
   browserName: "Android Browser"
   device: "Samsung Galaxy S7"
   os: "android"
   osVersion: "6.0"
   realMobile: true
 
-android_s8:
+android_7:
   browserName: "Android Browser"
   device: "Samsung Galaxy S8 Plus"
   os: "android"
   osVersion: "7.0"
   realMobile: true
 
-android_pixel_7:
+android_13:
   browserName: "Android Browser"
   device: "Google Pixel 7"
   os: "android"

data/lib/maze/configuration.rb

@@ -133,12 +133,6 @@ module Maze
     # Appium version to use
     attr_accessor :appium_version
 
-    # URI of the test-management service
-    attr_accessor :tms_uri
-
-    # Access token for the test-management service
-    attr_accessor :tms_token
-
     # URL of the Appium server
     attr_accessor :appium_server_url
 

data/lib/maze/logger.rb

@@ -3,6 +3,32 @@
 require 'logger'
 require 'singleton'
 
+# Monkey patch a 'trace' log level into the standard Logger
+class Logger
+  remove_const(:SEV_LABEL)
+  SEV_LABEL = {
+    -1 => 'TRACE',
+    0 => 'DEBUG',
+    1 => 'INFO',
+    2 => 'WARN',
+    3 => 'ERROR',
+    4 => 'FATAL',
+    5 => 'ANY'
+  }
+
+  module Severity
+    TRACE=-1
+  end
+
+  def trace(name = nil, &block)
+    add(TRACE, nil, name, &block)
+  end
+
+  def trace?
+    @level <= TRACE
+  end
+end
+
 # Logger classes
 module Maze
   # A logger, with level configured according to the environment
@@ -12,7 +38,9 @@ module Maze
     attr_accessor :datetime_format
 
     def initialize
-      if ENV['VERBOSE'] || ENV['DEBUG']
+      if ENV['TRACE']
+        super(STDOUT, level: Logger::TRACE)
+      elsif ENV['DEBUG']
         super(STDOUT, level: Logger::DEBUG)
       elsif ENV['QUIET']
         super(STDOUT, level: Logger::ERROR)