lsslog 0.1.7.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2901aaa24e2e5febc70327cda7c28a9f69d138ed480b516933574a367802d1d6
-  data.tar.gz: cd7ffabe342465071c43b9cfb3ff26181ee6e36f6bbe7dfc62fbf9feaf46a91f
+  metadata.gz: c54ea01fcda20826706329171d37135a08c73ae0190f1b402897e8229dca69e0
+  data.tar.gz: c4dbafeec49895ca9a66beead4e733ded235299c7532189e260beac05c95e80e
 SHA512:
-  metadata.gz: 2f29202fb14d5c0c9e6b170d6b729522d73437758ac3253e028c6b8fcacbfd6fe61e90f95a402f8f05519ade3a020d8301b5de5ae68d9c6e1663c50ff88810ef
-  data.tar.gz: 903079823059e4cc52530c53d02287bb396f448a86a2bac233c31e72cb738da38f2e63d532d54a0ac075caadfb3bfc304c82f76b2ea9741c435536974c3a3dec
+  metadata.gz: 3f0ccd031ff62377ec36f27e849f948ae6009b2e8279d0b7517fc1676af20c1601fbcb72fd55c519f32e7213f0256ae045442183a39f0ef14ad10891427c4c2b
+  data.tar.gz: e5f335ae47adabf3079f91fb2117c401f049b4b6c496c3bcd78b9b5621d97b1e47d7b3b19c9d97a2b321d295599aca9867c2369b1f1aeb4147b490fac9a76a96

data/lib/lsslog/services/v2/base.rb

@@ -0,0 +1,35 @@
+require 'grpc'
+require "lsslog_services_pb"
+
+module Lsslog
+  module Services
+    module V2
+      class Base
+        attr_reader :client
+
+        def initialize
+          @client = ::Lsslog::V2::Stub.new(lss_host, :this_channel_is_insecure)
+        end
+
+        def self.call(*args)
+          response = new.call(*args)
+
+          Lsslog.logger.info "#{self.name.demodulize}: #{response.to_json}"
+
+          response
+        rescue GRPC::BadStatus => e
+          Lsslog.logger.info "ERROR: #{e.message}"
+        end
+
+        private
+
+        def lss_host
+          @lss_host ||= ::Lsslog.configuration.lss_host
+          raise 'Lsslog.configuration.lss_host is missing' unless @lss_host
+
+          @lss_host
+        end
+      end
+    end
+  end
+end

data/lib/lsslog/services/v2/log.rb

@@ -0,0 +1,11 @@
+module Lsslog
+  module Services
+    module V2
+      class Log < ::Lsslog::Services::V2::Base
+        def call(message)
+          client.log(Lsslog::LogVer2.new(message))
+        end
+      end
+    end
+  end
+end

data/lib/lsslog/version.rb

@@ -1,3 +1,3 @@
 module Lsslog
-  VERSION = "0.1.7.7"
+  VERSION = "0.2.0"
 end

data/lib/lsslog.rb

@@ -10,6 +10,9 @@ require 'lsslog/services/set_lss_config'
 require 'lsslog/services/set_trans_exp_time'
 require 'lsslog/services/write_log'
 
+require 'lsslog/services/v2/base'
+require 'lsslog/services/v2/log'
+
 module Lsslog
   class Error < StandardError; end
 

data/lsslog.gemspec

@@ -1,7 +1,9 @@
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "lsslog/version"
 
+
 Gem::Specification.new do |spec|
   spec.name          = "lsslog"
   spec.version       = Lsslog::VERSION
@@ -24,7 +26,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f == "lsslog-#{Lsslog::VERSION}.gem" }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/proto/lsslog.proto

@@ -96,6 +96,19 @@ message ProdTransaction {
 	int64 created_at = 7;
 }
 
+message LogVer2 {
+  string severity = 1;
+  string timestamp = 2;
+  string api = 3;
+  string component = 4;
+  google.protobuf.Struct message = 5;
+}
+
+message LogResponseVer2 {
+  string id = 1;
+  uint32 timestamp = 2;
+}
+
 service LssLogService {
 	rpc WriteLog(LssLog) returns (LssRes) {};
 	rpc GetVersion(EmptyIn) returns (VersionOut) {};
@@ -106,19 +119,6 @@ service LssLogService {
 	rpc WriteProdTransaction(ProdTransaction) returns (LssRes) {};
 }
 
-message LogVer2 {
-	string severity = 1;
-    string timestamp = 2;
-    string api = 3;
-    string component = 4;
-    google.protobuf.Struct message = 5;
-}
-
-message LogResponseVer2 {
-    string id = 1;
-    uint32 timestamp = 2;
-}
-
 service V2 {
-    rpc Log(LogVer2) returns (LogResponseVer2) {};
-}
+  rpc Log(LogVer2) returns (LogResponseVer2) {};
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lsslog
 version: !ruby/object:Gem::Version
-  version: 0.1.7.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Thanh Ngo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -101,10 +101,10 @@ files:
 - lib/lsslog/services/remove_lss_config.rb
 - lib/lsslog/services/set_lss_config.rb
 - lib/lsslog/services/set_trans_exp_time.rb
-- lib/lsslog/services/v2.rb
+- lib/lsslog/services/v2/base.rb
+- lib/lsslog/services/v2/log.rb
 - lib/lsslog/services/write_log.rb
 - lib/lsslog/services/write_prod_transaction.rb
-- lib/lsslog/v2/log.rb
 - lib/lsslog/version.rb
 - lib/lsslog_pb.rb
 - lib/lsslog_services_pb.rb
@@ -114,7 +114,6 @@ files:
 - lsslog-0.1.3.pre.rc1.gem
 - lsslog-0.1.5.gem
 - lsslog-0.1.6.gem
-- lsslog-0.1.7.gem
 - lsslog.gemspec
 - proto/README.md
 - proto/lsslog.proto

data/lib/lsslog/services/v2.rb

@@ -1,64 +0,0 @@
-require 'grpc'
-require 'lsslog_services_pb'
-
-module Lsslog
-  module Services
-    class V2
-      def initialize
-        @stub = Lsslog::V2::Stub.new(lss_host, :this_channel_is_insecure)
-      end
-
-      def log(message_h:, severity:, component: '', api: '')
-        message_struct = hash_to_struct(message_h)
-
-        log_ver2 = Lsslog::LogVer2.new(
-          severity: severity,
-          timestamp: Time.now.utc.iso8601,
-          api: api,
-          component: component,
-          message: message_struct
-        )
-
-        Rails.logger.info("Sending LSS log. Message:[#{message_h}]")
-
-        response = @stub.log(log_ver2, deadline: Time.now + 5)
-        response
-      rescue GRPC::BadStatus => e
-        Rails.logger.error("Error sending LSS log: #{e.message}")
-        nil
-      end
-
-      private
-
-      def lss_host
-        @lss_host ||= ::Lsslog.configuration.lss_host
-        raise 'Lsslog.configuration.lss_host is missing' unless @lss_host
-
-        @lss_host
-      end
-
-      def hash_to_struct(hash)
-        Google::Protobuf::Struct.new(fields: hash.transform_values { |v| to_proto_value(v) })
-      end
-
-      def to_proto_value(value)
-        case value
-        when String
-          Google::Protobuf::Value.new(string_value: value)
-        when Numeric
-          Google::Protobuf::Value.new(number_value: value)
-        when TrueClass, FalseClass
-          Google::Protobuf::Value.new(bool_value: value)
-        when Hash
-          Google::Protobuf::Value.new(struct_value: hash_to_struct(value))
-        when Array
-          Google::Protobuf::Value.new(list_value: Google::Protobuf::ListValue.new(values: value.map { |v| to_proto_value(v) }))
-        when NilClass
-          Google::Protobuf::Value.new(null_value: :NULL_VALUE)
-        else
-          Google::Protobuf::Value.new(string_value: value.to_s)
-        end
-      end
-    end
-  end
-end

data/lib/lsslog/v2/log.rb

@@ -1,68 +0,0 @@
-require 'grpc'
-require 'lsslog_services_pb'
-
-module Lsslog
-  module V2
-    class Service
-      def initialize
-        Rails.logger.info("Initialize")
-        @stub = Lsslog::V2::Stub.new(lss_host, :this_channel_is_insecure)
-      end
-
-      def log(message_h:, severity:, component: '', api: '')
-        Rails.logger.info("Begin log function")
-        message_struct = hash_to_struct(message_h)
-
-        log_ver2 = Lsslog::LogVer2.new(
-          severity: severity,
-          timestamp: Time.now.utc.iso8601,
-          api: api,
-          component: component,
-          message: message_struct
-        )
-
-        Rails.logger.info("Sending LSS log. Message:[#{message_h}]")
-
-        response = @stub.log(log_ver2, deadline: Time.now + 5)
-        response
-      rescue GRPC::BadStatus => e
-        Rails.logger.error("Error sending LSS log: #{e.message}")
-        nil
-      rescue StandardError => e
-        Rails.logger.info("#{e.backtrace}, #{e.message}")
-      end
-
-      def lss_host
-        @lss_host ||= ::Lsslog.configuration.lss_host
-        raise 'Lsslog.configuration.lss_host is missing' unless @lss_host
-
-        @lss_host
-      end
-
-      private
-
-      def hash_to_struct(hash)
-        Google::Protobuf::Struct.new(fields: hash.transform_values { |v| to_proto_value(v) })
-      end
-
-      def to_proto_value(value)
-        case value
-        when String
-          Google::Protobuf::Value.new(string_value: value)
-        when Numeric
-          Google::Protobuf::Value.new(number_value: value)
-        when TrueClass, FalseClass
-          Google::Protobuf::Value.new(bool_value: value)
-        when Hash
-          Google::Protobuf::Value.new(struct_value: hash_to_struct(value))
-        when Array
-          Google::Protobuf::Value.new(list_value: Google::Protobuf::ListValue.new(values: value.map { |v| to_proto_value(v) }))
-        when NilClass
-          Google::Protobuf::Value.new(null_value: :NULL_VALUE)
-        else
-          Google::Protobuf::Value.new(string_value: value.to_s)
-        end
-      end
-    end
-  end
-end