openc3 5.0.10 → 5.1.0

data/lib/openc3/utilities/target_file.rb

@@ -12,58 +12,64 @@
 # 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 'fileutils'
 require 'json'
 require 'openc3/utilities/local_mode'
-require 'openc3/utilities/s3'
+require 'openc3/utilities/bucket'
 
 module OpenC3
   class TargetFile
+    # Matches ScriptRunner.vue const TEMP_FOLDER
+    TEMP_FOLDER = '__TEMP__'
 
-    DEFAULT_BUCKET_NAME = 'config'
-
-    def self.all(scope, path_matchers)
+    def self.all(scope, path_matchers, include_temp: false)
       result = []
       modified = []
+      temp = []
 
-      rubys3_client = Aws::S3::Client.new
-      token = nil
-      while true
-        resp = rubys3_client.list_objects_v2({
-          bucket: DEFAULT_BUCKET_NAME,
-          prefix: "#{scope}/targets",
-          max_keys: 1000,
-          continuation_token: token
-        })
+      bucket = Bucket.getClient()
+      resp = bucket.list_objects(
+        bucket: ENV['OPENC3_CONFIG_BUCKET'],
+        prefix: "#{scope}/targets",
+      )
+      resp.each do |object|
+        split_key = object.key.split('/')
+        # DEFAULT/targets_modified/__TEMP__/YYYY_MM_DD_HH_MM_SS_mmm_temp.rb
+        if split_key[2] == TEMP_FOLDER
+          temp << split_key[2..-1].join('/') if include_temp
+          next
+        end
 
-        resp.contents.each do |object|
-          split_key = object.key.split('/')
-          found = false
-          path_matchers.each do |path|
-            if split_key.include?(path)
-              found = true
-              break
-            end
-          end
-          next unless found
-          result_no_scope_or_target_folder = split_key[2..-1].join('/')
-          if object.key.include?("#{scope}/targets_modified")
-            modified << result_no_scope_or_target_folder
-          else
-            result << result_no_scope_or_target_folder
+        found = false
+        path_matchers.each do |path|
+          if split_key.include?(path)
+            found = true
+            break
           end
         end
-        break unless resp.is_truncated
-        token = resp.next_continuation_token
+        next unless found
+        result_no_scope_or_target_folder = split_key[2..-1].join('/')
+        if object.key.include?("#{scope}/targets_modified")
+          modified << result_no_scope_or_target_folder
+        else
+          result << result_no_scope_or_target_folder
+        end
       end
 
       # Add in local targets_modified if present
       if ENV['OPENC3_LOCAL_MODE']
-        local_modified = OpenC3::LocalMode.local_target_files(scope: scope, path_matchers: path_matchers)
+        local_modified = OpenC3::LocalMode.local_target_files(scope: scope, path_matchers: path_matchers, include_temp: include_temp)
         local_modified.each do |filename|
-          modified << filename unless modified.include?(filename)
-          result << filename unless result.include?(filename)
+          if include_temp and filename.include?(TEMP_FOLDER)
+            temp << filename
+          else
+            modified << filename unless modified.include?(filename)
+            result << filename unless result.include?(filename)
+          end
         end
       end
 
@@ -79,36 +85,50 @@ module OpenC3
 
       # Concat any remaining modified files (new files not in original target)
       result.concat(modified)
+      result.concat(temp.uniq)
       result.sort
     end
 
-    def self.body(scope, name)
-      name = name.split('*')[0] # Split '*' that indicates modified
-      rubys3_client = Aws::S3::Client.new
-      begin
-        # First try opening a potentially modified version by looking for the modified target
+    def self.delete_temp(scope)
+      bucket = Bucket.getClient()
+      resp = bucket.list_objects(
+        bucket: ENV['OPENC3_CONFIG_BUCKET'],
+        prefix: "#{scope}/targets_modified/#{TEMP_FOLDER}",
+      )
+      resp.each do |object|
+        bucket.delete_object(
+          bucket: ENV['OPENC3_CONFIG_BUCKET'],
+          key: object.key,
+        )
         if ENV['OPENC3_LOCAL_MODE']
-          local_file = OpenC3::LocalMode.open_local_file(name, scope: scope)
-          return local_file.read if local_file
+          OpenC3::LocalMode.delete_local(object.key)
         end
+      end
+      true
+    end
+
+    def self.body(scope, name)
+      name = name.split('*')[0] # Split '*' that indicates modified
+      # First try opening a potentially modified version by looking for the modified target
+      if ENV['OPENC3_LOCAL_MODE']
+        local_file = OpenC3::LocalMode.open_local_file(name, scope: scope)
+        return local_file.read if local_file
+      end
 
-        resp =
-          rubys3_client.get_object(
-            bucket: DEFAULT_BUCKET_NAME,
-            key: "#{scope}/targets_modified/#{name}",
-          )
-      rescue Aws::S3::Errors::NoSuchKey
+      bucket = Bucket.getClient()
+      resp = bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: "#{scope}/targets_modified/#{name}")
+      unless resp
         # Now try the original
-        resp =
-          rubys3_client.get_object(
-            bucket: DEFAULT_BUCKET_NAME,
-            key: "#{scope}/targets/#{name}",
-          )
+        resp = bucket.get_object(bucket: ENV['OPENC3_CONFIG_BUCKET'], key: "#{scope}/targets/#{name}")
       end
-      if File.extname(name) == ".bin"
-        resp.body.binmode
+      if resp && resp.body
+        if File.extname(name) == ".bin"
+          resp.body.binmode
+        end
+        resp.body.read
+      else
+        nil
       end
-      resp.body.read
     end
 
     def self.create(scope, name, text, content_type: 'text/plain')
@@ -116,31 +136,37 @@ module OpenC3
       if ENV['OPENC3_LOCAL_MODE']
         OpenC3::LocalMode.put_target_file("#{scope}/targets_modified/#{name}", text, scope: scope)
       end
-      OpenC3::S3Utilities.put_object_and_check(
+      client = Bucket.getClient()
+      client.put_object(
         # Use targets_modified to save modifications
         # This keeps the original target clean (read-only)
+        bucket: ENV['OPENC3_CONFIG_BUCKET'],
         key: "#{scope}/targets_modified/#{name}",
         body: text,
-        bucket: DEFAULT_BUCKET_NAME,
         content_type: content_type,
       )
-      true
+      # Wait for the object to exist
+      if client.check_object(
+        bucket: ENV['OPENC3_CONFIG_BUCKET'],
+        key: "#{scope}/targets_modified/#{name}",
+      )
+        true
+      else
+        false
+      end
     end
 
     def self.destroy(scope, name)
-      rubys3_client = Aws::S3::Client.new
-
       if ENV['OPENC3_LOCAL_MODE']
         OpenC3::LocalMode.delete_local("#{scope}/targets_modified/#{name}")
       end
 
       # Only delete file from the modified target directory
-      rubys3_client.delete_object(
+      Bucket.getClient.delete_object(
+        bucket: ENV['OPENC3_CONFIG_BUCKET'],
         key: "#{scope}/targets_modified/#{name}",
-        bucket: DEFAULT_BUCKET_NAME,
       )
       true
     end
-
   end
-end
+end

data/lib/openc3/utilities/zip.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 require 'zip'
 require 'zip/filesystem'

data/lib/openc3/utilities.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 module OpenC3
   autoload(:Logger, 'openc3/utilities/logger.rb')

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.0.10'
+OPENC3_VERSION = '5.1.0'
 module OpenC3
   module Version
     MAJOR = '5'
-    MINOR = '0'
-    PATCH = '10'
+    MINOR = '1'
+    PATCH = '0'
     OTHER = ''
-    BUILD = 'a9ab663d6355e0f8d8e62ca67ea300b949f34420'
+    BUILD = '7bd7fb9fdfa75abefb1b6ef01a55931c7b1d98dd'
   end
-  VERSION = '5.0.10'
-  GEM_VERSION = '5.0.10'
+  VERSION = '5.1.0'
+  GEM_VERSION = '5.1.0'
 end

data/lib/openc3/win32/excel.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 require 'win32ole'
 require 'fileutils'

data/lib/openc3/win32/win32.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, 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/win32/win32_main'
 require 'openc3/packets/structure'

data/lib/openc3/win32/win32_main.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 module OpenC3
   if RUBY_ENGINE == 'ruby'

data/lib/openc3.rb

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 # This file sets up using the OpenC3 framework
 

data/tasks/gemfile_stats.rake

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 desc 'Create a picture of gemfile downloads'
 task :gemfile_stats do

data/tasks/spec.rake

@@ -16,6 +16,9 @@
 # Modified by OpenC3, Inc.
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
+#
+# This file may also be used under the terms of a commercial license 
+# if purchased from OpenC3, Inc.
 
 begin
   require 'rspec/core/rake_task'

data/templates/plugin-template/plugin.gemspec

@@ -19,5 +19,5 @@ spec = Gem::Specification.new do |s|
   else
     s.version = '0.0.0' + ".#{time}"
   end
-  s.files = Dir.glob("{targets,lib,procedures,tools,microservices}/**/*") + %w(Rakefile README.md plugin.txt)
+  s.files = Dir.glob("{targets,lib,tools,microservices}/**/*") + %w(Rakefile README.md plugin.txt)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.0.10
+  version: 5.1.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,104 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-sdk
+  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: opentelemetry-exporter-otlp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-action_pack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-http_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-aws_sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dead_end
   requirement: !ruby/object:Gem::Requirement
@@ -700,6 +798,8 @@ files:
 - lib/openc3/io/udp_sockets.rb
 - lib/openc3/io/win32_serial_driver.rb
 - lib/openc3/logs.rb
+- lib/openc3/logs/buffered_packet_log_reader.rb
+- lib/openc3/logs/buffered_packet_log_writer.rb
 - lib/openc3/logs/log_writer.rb
 - lib/openc3/logs/packet_log_constants.rb
 - lib/openc3/logs/packet_log_reader.rb
@@ -789,6 +889,7 @@ files:
 - lib/openc3/script/suite.rb
 - lib/openc3/script/suite_results.rb
 - lib/openc3/script/suite_runner.rb
+- lib/openc3/script/telemetry.rb
 - lib/openc3/streams/serial_stream.rb
 - lib/openc3/streams/stream.rb
 - lib/openc3/streams/tcpip_client_stream.rb
@@ -818,24 +919,29 @@ files:
 - lib/openc3/topics/notifications_topic.rb
 - lib/openc3/topics/router_topic.rb
 - lib/openc3/topics/telemetry_decom_topic.rb
+- lib/openc3/topics/telemetry_reduced_topics.rb
 - lib/openc3/topics/telemetry_topic.rb
 - lib/openc3/topics/timeline_topic.rb
 - lib/openc3/topics/topic.rb
 - lib/openc3/utilities.rb
 - lib/openc3/utilities/authentication.rb
 - lib/openc3/utilities/authorization.rb
+- lib/openc3/utilities/aws_bucket.rb
+- lib/openc3/utilities/bucket.rb
+- lib/openc3/utilities/bucket_file_cache.rb
+- lib/openc3/utilities/bucket_utilities.rb
 - lib/openc3/utilities/crc.rb
 - lib/openc3/utilities/csv.rb
+- lib/openc3/utilities/local_bucket.rb
 - lib/openc3/utilities/local_mode.rb
 - lib/openc3/utilities/logger.rb
 - lib/openc3/utilities/message_log.rb
 - lib/openc3/utilities/metric.rb
+- lib/openc3/utilities/open_telemetry.rb
 - lib/openc3/utilities/process_manager.rb
 - lib/openc3/utilities/quaternion.rb
 - lib/openc3/utilities/ruby_lex_utils.rb
-- lib/openc3/utilities/s3.rb
 - lib/openc3/utilities/s3_autoload.rb
-- lib/openc3/utilities/s3_file_cache.rb
 - lib/openc3/utilities/simulated_target.rb
 - lib/openc3/utilities/sleeper.rb
 - lib/openc3/utilities/store.rb