openc3 5.7.2 → 5.8.0

data/lib/openc3/models/gem_model.rb

@@ -23,7 +23,6 @@
 require 'fileutils'
 require 'open-uri'
 require 'nokogiri'
-require 'httpclient'
 require 'rubygems'
 require 'rubygems/uninstaller'
 require 'tempfile'

data/lib/openc3/models/scope_model.rb

@@ -135,7 +135,6 @@ module OpenC3
     end
 
     def deploy_unknown_commandlog_microservice(gem_path, variables, parent)
-      Topic.initialize_streams(["#{@scope}__COMMAND__{UNKNOWN}__UNKNOWN"])
       microservice_name = "#{@scope}__COMMANDLOG__UNKNOWN"
       microservice = MicroserviceModel.new(
         name: microservice_name,
@@ -158,7 +157,6 @@ module OpenC3
     end
 
     def deploy_unknown_packetlog_microservice(gem_path, variables, parent)
-      Topic.initialize_streams(["#{@scope}__TELEMETRY__{UNKNOWN}__UNKNOWN"])
       microservice_name = "#{@scope}__PACKETLOG__UNKNOWN"
       microservice = MicroserviceModel.new(
         name: microservice_name,
@@ -211,7 +209,6 @@ module OpenC3
 
     def deploy(gem_path, variables)
       seed_database()
-      ConfigTopic.initialize_stream(@scope)
 
       # Create UNKNOWN target for display of unknown data
       model = TargetModel.new(name: "UNKNOWN", scope: @scope)

data/lib/openc3/models/target_model.rb

@@ -527,7 +527,13 @@ module OpenC3
               data = ERB.new(data, trim_mode: "-").result(binding.set_variables(variables)) if data.is_printable? and File.basename(filename)[0] != '_'
             end
           rescue => error
-            raise "ERB error parsing: #{filename}: #{error.formatted}"
+            # ERB error parsing a screen is just a logger error because life can go on
+            # With cmd/tlm or scripts this is a serious error and we raise
+            if (filename.include?('/screens/'))
+              Logger.error("ERB error parsing #{key} due to #{error.message}")
+            else
+              raise "ERB error parsing #{key} due to #{error.message}"
+            end
           end
           local_path = File.join(temp_dir, @name, target_folder_path)
           FileUtils.mkdir_p(File.dirname(local_path))
@@ -965,12 +971,6 @@ module OpenC3
       rescue
         # No telemetry packets for this target
       end
-      # It's ok to call initialize_streams with an empty array
-      Topic.initialize_streams(command_topic_list)
-      Topic.initialize_streams(decom_command_topic_list)
-      Topic.initialize_streams(packet_topic_list)
-      Topic.initialize_streams(decom_topic_list)
-      Topic.initialize_streams(reduced_topic_list)
 
       @parent = nil
       %w(DECOM COMMANDLOG DECOMCMDLOG PACKETLOG DECOMLOG REDUCER CLEANUP).each do |type|

data/lib/openc3/models/timeline_model.rb

@@ -128,7 +128,6 @@ module OpenC3
 
     def deploy
       topics = ["#{@scope}__#{PRIMARY_KEY}"]
-      TimelineTopic.initialize_streams(topics)
       # Timeline Microservice
       microservice = MicroserviceModel.new(
         name: @name,

data/lib/openc3/models/trigger_group_model.rb

@@ -172,7 +172,6 @@ module OpenC3
     def deploy
       topics = ["#{@scope}__openc3_autonomic"]
       if MicroserviceModel.get_model(name: @microservice_name, scope: @scope).nil?
-        AutonomicTopic.initialize_streams(topics)
         create_microservice(topics: topics)
       end
     end

data/lib/openc3/script/metadata.rb

@@ -35,7 +35,7 @@ module OpenC3
     def metadata_all(limit: 100, scope: $openc3_scope)
       response = $api_server.request('get', "/openc3-api/metadata", query: { limit: limit }, scope: scope)
       # Non-existant just returns nil
-      return nil if response.nil? || response.code != 200
+      return nil if response.nil? || response.status != 200
       return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
     end
     alias all_metadata metadata_all
@@ -50,7 +50,7 @@ module OpenC3
         response = $api_server.request('get', "/openc3-api/metadata/latest", scope: scope)
       end
       # Non-existant just returns nil
-      return nil if response.nil? || response.code != 200
+      return nil if response.nil? || response.status != 200
       return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
     end
     alias get_metadata metadata_get
@@ -70,11 +70,11 @@ module OpenC3
       data[:start] = start.iso8601 unless start.nil?
       response = $api_server.request('post', '/openc3-api/metadata', data: data, json: true, scope: scope)
       if response.nil?
-        raise "Failed to set metadata due to #{response.code}"
-      elsif response.code == 409
+        raise "Failed to set metadata due to #{response.status}"
+      elsif response.status == 409
         raise "Metadata overlaps existing metadata. Did you metadata_set within 1s of another?"
-      elsif response.code != 201
-        raise "Failed to set metadata due to #{response.code}"
+      elsif response.status != 201
+        raise "Failed to set metadata due to #{response.status}"
       end
       return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
     end
@@ -101,7 +101,7 @@ module OpenC3
       data = { :color => color, :metadata => metadata }
       data[:start] = Time.at(start).iso8601
       response = $api_server.request('put', "/openc3-api/metadata/#{start}", data: data, json: true, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         raise "Failed to update metadata"
       end
       return JSON.parse(response.body, :allow_nan => true, :create_additions => true)

data/lib/openc3/script/screen.rb

@@ -25,7 +25,7 @@ module OpenC3
         endpoint = "/openc3-api/screens"
         # Pass the name of the ENV variable name where we pull the actual bucket name
         response = $api_server.request('get', endpoint, scope: scope)
-        if response.nil? || response.code != 200
+        if response.nil? || response.status != 200
           raise "Unexpected response to get_screen_list: #{response.inspect}"
         end
         screen_list = {}
@@ -50,7 +50,7 @@ module OpenC3
         response = $api_server.request('get', endpoint, headers: {
           Accept: 'text/plain',
         }, scope: scope)
-        if response.nil? || response.code != 200
+        if response.nil? || response.status != 200
           raise "Screen definition not found: #{target_name} #{screen_name}"
         end
         return response.body
@@ -67,8 +67,8 @@ module OpenC3
           "screen" => screen_name,
           "text" => definition
         }
-        response = $api_server.request('post', endpoint, :data => data, scope: scope)
-        if response.nil? || response.code != 200
+        response = $api_server.request('post', endpoint, :data => data, :json => true, scope: scope)
+        if response.nil? || response.status != 200
           if response
             parsed = JSON.parse(response)
             raise "create_screen error: #{parsed['error']}"
@@ -86,7 +86,7 @@ module OpenC3
       begin
         endpoint = "/openc3-api/screen/#{target_name.upcase}/#{screen_name.upcase}"
         response = $api_server.request('delete', endpoint, scope: scope)
-        if response.nil? || response.code != 200
+        if response.nil? || response.status != 200
           if response
             parsed = JSON.parse(response)
             raise "delete_screen error: #{parsed['error']}"

data/lib/openc3/script/script_runner.rb

@@ -22,7 +22,7 @@ module OpenC3
 
     def _script_response_error(response, message, scope: $openc3_scope)
       if response
-        raise "#{message} (#{response.code}): #{response.body}"
+        raise "#{message} (#{response.status}): #{response.body}"
       else
         raise "#{message}: No Response"
       end
@@ -31,7 +31,7 @@ module OpenC3
     def script_list(scope: $openc3_scope)
       endpoint = "/script-api/scripts"
       response = $script_runner_api_server.request('get', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Script list request failed", scope: scope)
       else
         return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -41,7 +41,7 @@ module OpenC3
     def script_syntax_check(script, scope: $openc3_scope)
       endpoint = "/script-api/scripts/syntax"
       response = $script_runner_api_server.request('post', endpoint, json: true, data: script, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Script syntax check request failed", scope: scope)
       else
         result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -56,7 +56,7 @@ module OpenC3
     def script_body(filename, scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}"
       response = $script_runner_api_server.request('get', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Failed to get #{filename}", scope: scope)
       else
         script = response.body
@@ -82,7 +82,7 @@ module OpenC3
       end
       # NOTE: json: true causes json_api_object to JSON generate and set the Content-Type to json
       response = $script_runner_api_server.request('post', endpoint, json: true, data: { environment: env_data }, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Failed to run #{filename}", scope: scope)
       else
         script_id = Integer(response.body)
@@ -93,7 +93,7 @@ module OpenC3
     def script_delete(filename, scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}/delete"
       response = $script_runner_api_server.request('post', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Failed to delete #{filename}", scope: scope)
       else
         return true
@@ -103,7 +103,7 @@ module OpenC3
     def script_lock(filename, scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}/lock"
       response = $script_runner_api_server.request('post', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Failed to lock #{filename}", scope: scope)
       else
         return true
@@ -113,7 +113,7 @@ module OpenC3
     def script_unlock(filename, scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}/unlock"
       response = $script_runner_api_server.request('post', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Failed to unlock #{filename}", scope: scope)
       else
         return true
@@ -123,7 +123,7 @@ module OpenC3
     def script_instrumented(filename, script, scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}/instrumented"
       response = $script_runner_api_server.request('post', endpoint, json: true, data: script, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Script instrumented request failed", scope: scope)
       else
         result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -139,7 +139,7 @@ module OpenC3
     def script_create(filename, script, breakpoints = [], scope: $openc3_scope)
       endpoint = "/script-api/scripts/#{filename}"
       response = $script_runner_api_server.request('post', endpoint, json: true, data: { text: script, breakpoints: breakpoints }, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Script create request failed", scope: scope)
       else
         return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -149,7 +149,7 @@ module OpenC3
     def script_delete_all_breakpoints(scope: $openc3_scope)
       endpoint = "/script-api/breakpoints/delete/all"
       response = $script_runner_api_server.request('delete', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Script delete all breakpoints failed", scope: scope)
       else
         return true
@@ -159,7 +159,7 @@ module OpenC3
     def running_script_list(scope: $openc3_scope)
       endpoint = "/script-api/running-script"
       response = $script_runner_api_server.request('get', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Running script list request failed", scope: scope)
       else
         return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -169,7 +169,7 @@ module OpenC3
     def running_script_get(id, scope: $openc3_scope)
       endpoint = "/script-api/running-script/#{id}"
       response = $script_runner_api_server.request('get', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Running script show request failed", scope: scope)
       else
         return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
@@ -179,7 +179,7 @@ module OpenC3
     def _running_script_action(id, action_name, scope: $openc3_scope)
       endpoint = "/script-api/running-script/#{id}/#{action_name}"
       response = $script_runner_api_server.request('post', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Running script #{action_name} request failed", scope: scope)
       else
         return true
@@ -217,7 +217,7 @@ module OpenC3
     def running_script_debug(id, debug_code, scope: $openc3_scope)
       endpoint = "/script-api/running-script/#{id}/debug"
       response = $script_runner_api_server.request('post', endpoint, json: true, data: {'args' => debug_code}, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Running script debug request failed", scope: scope)
       else
         return true
@@ -231,7 +231,7 @@ module OpenC3
       else
         response = $script_runner_api_server.request('post', endpoint, json: true, data: {'method' => method_name, 'answer' => answer, 'prompt_id' => prompt_id}, scope: scope)
       end
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Running script prompt request failed", scope: scope)
       else
         return true
@@ -241,7 +241,7 @@ module OpenC3
     def completed_script_list(scope: $openc3_scope)
       endpoint = "/script-api/completed-scripts"
       response = $script_runner_api_server.request('get', endpoint, scope: scope)
-      if response.nil? || response.code != 200
+      if response.nil? || response.status != 200
         _script_response_error(response, "Completed script list request failed", scope: scope)
       else
         return JSON.parse(response.body, :allow_nan => true, :create_additions => true)

data/lib/openc3/script/storage.rb

@@ -40,7 +40,7 @@ module OpenC3
         OpenC3::Logger.info "Deleting #{delete_path}"
         # Pass the name of the ENV variable name where we pull the actual bucket name
         response = $api_server.request('delete', endpoint, query: { bucket: 'OPENC3_CONFIG_BUCKET' }, scope: scope)
-        if response.nil? || response.code != 200
+        if response.nil? || response.status != 200
           raise "Failed to delete #{delete_path}"
         end
       rescue => error
@@ -181,7 +181,7 @@ module OpenC3
       else
         response = $api_server.request('get', endpoint, query: { bucket: 'OPENC3_CONFIG_BUCKET' }, scope: scope)
       end
-      if response.nil? || response.code != 201
+      if response.nil? || response.status != 201
         raise "Failed to get presigned URL for #{endpoint}"
       end
       JSON.parse(response.body, :allow_nan => true, :create_additions => true)

data/lib/openc3/topics/config_topic.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/topics/topic'
@@ -26,11 +26,6 @@ module OpenC3
   class ConfigTopic < Topic
     PRIMARY_KEY = "__CONFIG"
 
-    # Helper method to initialize the stream and ensure a consistent key
-    def self.initialize_stream(scope)
-      self.initialize_streams(["#{scope}#{PRIMARY_KEY}"])
-    end
-
     # Write a configuration change to the topic
     # @param config [Hash] Hash with required keys 'kind', 'name', 'type'
     def self.write(config, scope:)

data/lib/openc3/topics/decom_interface_topic.rb

@@ -0,0 +1,62 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3/topics/topic'
+
+module OpenC3
+  class DecomInterfaceTopic < Topic
+    def self.build_cmd(target_name, cmd_name, cmd_params, range_check, raw, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_name'] = cmd_name.to_s.upcase
+      data['cmd_params'] = cmd_params
+      data['range_check'] = range_check
+      data['raw'] = raw
+      # DecomMicroservice is listening to the DECOMINTERFACE topic and is responsible
+      # for actually building the command. This was deliberate to allow this to work
+      # with or without an interface.
+      decom_id = Topic.write_topic("#{scope}__DECOMINTERFACE__{#{target_name}}",
+          { 'build_cmd' => JSON.generate(data, allow_nan: true) }, '*', 100)
+      timeout = 5 # Arbitrary 5s timeout
+      ack_topic = "{#{scope}__ACKCMD}TARGET__#{target_name}"
+      time = Time.now
+      while (Time.now - time) < timeout
+        Topic.read_topics([ack_topic]) do |topic, msg_id, msg_hash, redis|
+          if msg_hash["id"] == decom_id
+            if msg_hash["result"] == "SUCCESS"
+              return msg_hash
+            else
+              raise msg_hash["message"]
+            end
+          end
+        end
+      end
+      raise "Timeout of #{timeout}s waiting for cmd ack. Does target '#{target_name}' exist?"
+    end
+
+    def self.inject_tlm(target_name, packet_name, item_hash = nil, type: :CONVERTED, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['packet_name'] = packet_name.to_s.upcase
+      data['item_hash'] = item_hash
+      data['type'] = type
+      Topic.write_topic("#{scope}__DECOMINTERFACE__{#{target_name}}",
+          { 'inject_tlm' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+  end
+end

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -56,14 +56,5 @@ module OpenC3
         end
       end
     end
-
-    def self.inject_tlm(target_name, packet_name, item_hash = nil, type: :CONVERTED, scope:)
-      data = {}
-      data['target_name'] = target_name.to_s.upcase
-      data['packet_name'] = packet_name.to_s.upcase
-      data['item_hash'] = item_hash
-      data['type'] = type
-      Topic.write_topic("#{scope}__DECOMINTERFACE__{#{target_name}}", { 'inject_tlm' => JSON.generate(data, allow_nan: true) }, '*', 100)
-    end
   end
 end

data/lib/openc3/topics/topic.rb

@@ -17,23 +17,16 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/utilities/store'
 
 module OpenC3
   class Topic
-    if RUBY_VERSION < "3"
-      # Delegate all unknown class methods to delegate to the EphemeralStore
-      def self.method_missing(message, *args, &block)
-        EphemeralStore.public_send(message, *args, &block)
-      end
-    else
-      # Delegate all unknown class methods to delegate to the EphemeralStore
-      def self.method_missing(message, *args, **kwargs, &block)
-        EphemeralStore.public_send(message, *args, **kwargs, &block)
-      end
+    # Delegate all unknown class methods to delegate to the EphemeralStore
+    def self.method_missing(message, *args, **kwargs, &block)
+      EphemeralStore.public_send(message, *args, **kwargs, &block)
     end
 
     def self.clear_topics(topics, maxlen = 0)

data/lib/openc3/utilities/authentication.rb

@@ -14,19 +14,18 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2023, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/version'
+require 'faraday'
 
 module OpenC3
-
   # Basic exception for known errors
   class OpenC3AuthenticationError < StandardError; end
-
   class OpenC3AuthenticationRetryableError < OpenC3AuthenticationError; end
 
   # OpenC3 base / open source authentication code
@@ -71,6 +70,7 @@ module OpenC3
       @refresh_expires_at = nil
       @token = nil
       @log = [nil, nil]
+      @http = Faraday.new
     end
 
     # Load the token from the environment
@@ -150,7 +150,7 @@ module OpenC3
       STDOUT.puts @log[0] if JsonDRb.debug?
       saved_verbose = $VERBOSE; $VERBOSE = nil
       begin
-        resp = HTTPClient.new().post(uri, :body => data, :header => headers)
+        resp = @http.post(uri, data, headers)
       ensure
         $VERBOSE = saved_verbose
       end

data/lib/openc3/utilities/bucket_require.rb

@@ -0,0 +1,65 @@
+# encoding: ascii-8bit
+
+# Copyright 2022 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3'
+require 'openc3/utilities/bucket_utilities'
+
+OpenC3.disable_warnings do
+  def require(*args, **kw_args)
+    begin
+      return super(*args, **kw_args)
+    rescue LoadError
+      begin
+        @bucket_require_cache ||= {}
+        if @bucket_require_cache[args[0]]
+          return false
+        else
+          scope = nil
+          if kw_args[:scope]
+            scope = kw_args[:scope]
+          else
+            scope = $openc3_scope
+          end
+          OpenC3::BucketUtilities.bucket_load(*args, scope: scope)
+          @bucket_require_cache[args[0]] = true
+          return true
+        end
+      rescue Exception => err
+        raise LoadError, "#{err.class}:#{err.message}", err.backtrace
+      end
+    end
+  end
+
+  def load(*args, **kw_args)
+    begin
+      super(*args, **kw_args)
+    rescue LoadError
+      begin
+        scope = nil
+        if kw_args[:scope]
+          scope = kw_args[:scope]
+        else
+          scope = $openc3_scope
+        end
+        OpenC3::BucketUtilities.bucket_load(*args, scope: scope)
+      rescue Exception
+        raise LoadError, "#{err.class}:#{err.message}", err.backtrace
+      end
+    end
+  end
+end

data/lib/openc3/utilities/bucket_utilities.rb

@@ -21,6 +21,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'openc3/utilities/bucket'
+require 'openc3/utilities/target_file'
 require 'openc3/models/reducer_model'
 require 'zlib'
 
@@ -29,6 +30,26 @@ module OpenC3
     FILE_TIMESTAMP_FORMAT = "%Y%m%d%H%M%S%N"
     DIRECTORY_TIMESTAMP_FORMAT = "%Y%m%d"
 
+    def self.bucket_load(*args, scope: $openc3_scope)
+      path = args[0]
+
+      # Only support TARGET files
+      if path[0] == '/' or path.split('/')[0].to_s.upcase != path.split('/')[0]
+        raise LoadError
+      end
+      extension = File.extname(path)
+      path = path + '.rb' if extension == ""
+
+      # Retrieve the text of the script from S3
+      text = TargetFile.body(scope, path)
+
+      # Execute the script directly without instrumentation because we are doing require/load
+      Object.class_eval(text, path, 1)
+
+      # Successful load/require returns true
+      true
+    end
+
     # @param bucket [String] Name of the bucket to list
     # @param prefix [String] Prefix to filter all files by
     # @param start_time [Time|nil] Ruby time to find files after. nil means no start (first file on).
@@ -66,12 +87,24 @@ module OpenC3
           filename = compress_file(filename)
           bucket_key += '.gz'
         end
-        # We want to open this as a file and pass that to put_object to allow
-        # this to work with really large files. Otherwise the entire file has
-        # to be held in memory!
-        File.open(filename, 'rb') do |file|
-          client.put_object(bucket: ENV['OPENC3_LOGS_BUCKET'], key: bucket_key, body: file, metadata: metadata)
+
+        retry_count = 0
+        begin
+          # We want to open this as a file and pass that to put_object to allow
+          # this to work with really large files. Otherwise the entire file has
+          # to be held in memory!
+          File.open(filename, 'rb') do |file|
+            client.put_object(bucket: ENV['OPENC3_LOGS_BUCKET'], key: bucket_key, body: file, metadata: metadata)
+          end
+        rescue => err
+          # Try to upload file three times
+          retry_count += 1
+          raise err if retry_count >= 3
+          Logger.warn("Error saving log file to bucket - retry #{retry_count}: #{filename}\n#{err.formatted}")
+          sleep(1)
+          retry
         end
+
         Logger.debug "wrote #{ENV['OPENC3_LOGS_BUCKET']}/#{bucket_key}"
         ReducerModel.add_file(bucket_key) # Record the new file for data reduction
 

data/lib/openc3/utilities/open_telemetry.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2023 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -13,7 +13,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'openc3/utilities/bucket'
@@ -60,7 +60,7 @@ module OpenC3
 
       if @otel_enabled
         require 'redis'
-        require 'httpclient'
+        require 'faraday'
         require 'openc3/utilities/bucket'
         # Load the bucket client code so the instrumentation works later
         Bucket.getClient()
@@ -86,7 +86,7 @@ module OpenC3
             # To omit the attribute, set db_statement to :omit.
             db_statement: :include,
           }
-          c.use 'OpenTelemetry::Instrumentation::HttpClient'
+          c.use 'OpenTelemetry::Instrumentation::Faraday'
           c.use 'OpenTelemetry::Instrumentation::AwsSdk'
           # TODO: Add in additional cloud SDKs
         end