From d8b9d99cb267481efc71d1f7546b243a4b9b0abf Mon Sep 17 00:00:00 2001
From: Steve Kirkland <steve.kirkland@smartbear.com>
Date: Thu, 27 Feb 2025 17:21:35 +0000
Subject: [PATCH] Corrections

---
 lib/maze/client/appium/base_client.rb      |  2 ++
 lib/maze/client/appium/bb_client.rb        | 13 +++++--------
 lib/maze/client/appium/bs_client.rb        |  3 +--
 lib/maze/client/appium/session_metadata.rb |  1 +
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/maze/client/appium/base_client.rb b/lib/maze/client/appium/base_client.rb
index 3b995bb5..98f87b1b 100644
--- a/lib/maze/client/appium/base_client.rb
+++ b/lib/maze/client/appium/base_client.rb
@@ -79,6 +79,7 @@ def attempt_start_driver(config)
             # Log details of this session
             $logger.info "Created Appium session: #{driver.session_id}"
             @session_metadata = Maze::Client::Appium::SessionMetadata.new
+            @session_metadata.id = driver.session_id
             @session_metadata.farm = Maze.config.farm.to_s
           end
           driver
@@ -168,6 +169,7 @@ def report_session
           Bugsnag.notify(error) do |bsg_event|
             bsg_event.api_key = ENV['MAZE_APPIUM_BUGSNAG_API_KEY']
             metadata = {
+              'session id': @session_metadata.id,
               'success': @session_metadata.success,
               'device farm': @session_metadata.farm.to_s,
             }
diff --git a/lib/maze/client/appium/bb_client.rb b/lib/maze/client/appium/bb_client.rb
index 559fc2b8..ec0f0483 100644
--- a/lib/maze/client/appium/bb_client.rb
+++ b/lib/maze/client/appium/bb_client.rb
@@ -91,14 +91,11 @@ def log_run_intro
         def log_run_outro
           api_client = BitBarApiClient.new(Maze.config.access_key)
 
-          $logger.info 'Appium session(s) created:'
-          @session_ids.each do |id|
-            info = api_client.get_device_session_info(id)
-            if info
-              link = Maze::Loggers::LogUtil.linkify(info[:dashboard_link], "BitBar session: #{id}")
-              $logger.info link
-              $logger.info "Device used: #{info[:device_name]}"
-            end
+          info = api_client.get_device_session_info(@session_metadata.id)
+          if info
+            link = Maze::Loggers::LogUtil.linkify(info[:dashboard_link], "BitBar session: #{id}")
+            $logger.info link
+            $logger.info "Device used: #{info[:device_name]}"
           end
         end
 
diff --git a/lib/maze/client/appium/bs_client.rb b/lib/maze/client/appium/bs_client.rb
index 20fcc63e..2c16779e 100644
--- a/lib/maze/client/appium/bs_client.rb
+++ b/lib/maze/client/appium/bs_client.rb
@@ -72,8 +72,7 @@ def log_run_intro
         end
 
         def log_run_outro
-          $logger.info 'Appium session(s) created:'
-          @session_ids.each { |id| $logger.info "  #{id}" }
+          $logger.info "Appium session created: #{@session_metadata.id}"
           log_run_intro
         end
 
diff --git a/lib/maze/client/appium/session_metadata.rb b/lib/maze/client/appium/session_metadata.rb
index 79430efc..1d0f4e99 100644
--- a/lib/maze/client/appium/session_metadata.rb
+++ b/lib/maze/client/appium/session_metadata.rb
@@ -7,6 +7,7 @@ def initialize
           @failure_message = 'Default failure message'
         end
 
+        attr_accessor :id
         attr_accessor :farm
         attr_accessor :device
         attr_accessor :success