rails_loki_exporter 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce248aa49394ba911efadd30695bc1d71a19ea2e8cd9909099339a4cb2bc5eb
-  data.tar.gz: c744a44f2bd0ee8f01391d0a2b8da796bc84ff71fad4ac8d1cbf7b5d95c12fc3
+  metadata.gz: 93cc7ab2fe4c6fadb43616ca5f9416b0f82bc1f8434bfa8c389329c016d4528a
+  data.tar.gz: b70e7a5189a35825e996c582658d5b062f2849891dd2262181eacc025e5e52dc
 SHA512:
-  metadata.gz: 40491ac4ac77da177c05f445ad2e31332535f4784654aaeebf78d81eb1ec15e45f5ad8db6306a955b47e67d887574f22cefcd7efac8759bcd4b050f05ecb3c90
-  data.tar.gz: 5a5d1ec7f81b184cee101091a3330c6f7c6d31d300681f6028d28e113bb732aa8cf2690aaf99dae689218f9c473bea2c5585299a11f48fe12fa42541bddf7bd6
+  metadata.gz: 06fbb48beee20de45796edfbd1c58299649b919d9ec5551d4701c7dbae04a4033e07c5dfed3f83719f388d7e2b54285cd6eccd8e0afc5396ab79c2110b0f0b78
+  data.tar.gz: 425291ee06d0bff6430703a46894d2436f3116edb7b6d0def9e121b8685d7834e0e344f319c846833fdc7aa7645e4349d6351656b4df601bf967a78492fc531e

data/README.md

@@ -32,6 +32,8 @@ user_name: 'Your User number'
 password: 'Your Grafana.com API Token'
 log_file_path: 'log/#{Rails.env}.log'
 logs_type: '%w(ERROR WARN FATAL INFO DEBUG)'
+interaction_interval: 5
+max_buffer_size: 100
 intercept_logs: true
 ``` 
 - Add block for **Rails Loki Exporter** in your `application.rb` file:

data/lib/rails_loki_exporter/intercepting_logger.rb

@@ -44,10 +44,10 @@ module RailsLokiExporter
     private
 
     def format_message(severity, datetime, progname, msg)
-          puts "severity: #{severity}"
-          puts "datetime: #{datetime}"
-          puts "progname: #{progname}"
-          puts "msg: #{msg}"
+          # puts "severity: #{severity}"
+          # puts "datetime: #{datetime}"
+          # puts "progname: #{progname}"
+          # puts "msg: #{msg}"
       "#{severity} #{progname}: #{msg}\n"
     end
 

data/lib/rails_loki_exporter/loki_http_client.rb

@@ -21,8 +21,8 @@ module RailsLokiExporter
       @auth_enabled =   config['auth_enabled']
       @log_buffer = []
       @last_interaction_time = nil
-      @interaction_interval = 1       # in seconds, adjust as needed
-      @max_buffer_size = 10           # set the maximum number of logs to buffer
+      @interaction_interval = (config['interaction_interval'] || '5').to_i     # in seconds, adjust as needed
+      @max_buffer_size =      (config['max_buffer_size'] || '100').to_i        # set the maximum number of logs to buffer
 
       http = Net::HTTP.new(@base_url.to_s, @base_url.port)
       http.use_ssl = @base_url.scheme == 'https'
@@ -32,27 +32,30 @@ module RailsLokiExporter
     end
 
     def send_log(log_message)
-        @log_buffer << log_message
-        if @log_buffer.size >= @max_buffer_size || can_send_log?
-          send_buffered_logs
-          @last_interaction_time = Time.now
-        else
-          # @logger.info('Log buffered. Waiting for more logs or interaction interval.')
-        end
+      current_timestamp = Time.now.to_f * 1_000_000_000
+      @log_buffer << [current_timestamp.to_i.to_s, log_message.chomp]
+      if @log_buffer.size >= @max_buffer_size || can_send_log?
+        send_buffered_logs
+        @last_interaction_time = Time.now
+      else
+        # @logger.info('Log buffered. Waiting for more logs or interaction interval.')
+      end
     end
 
     private
     def send_buffered_logs
       return if @log_buffer.empty?
 
-      curr_datetime = Time.now.to_i * 1_000_000_000
       msg = "On server #{@host_name} detected error"
       payload = {
         'streams' => [
-          { 'stream' => {
-            'job' => @job_name,
-            'host' => @host_name },
-            'values' => @log_buffer.map { |log| [curr_datetime.to_s, log] }}
+          {
+            'stream' => {
+              'job' => @job_name,
+              'host' => @host_name,
+            },
+            'values' => @log_buffer,
+          }
         ]
       }
 

data/lib/rails_loki_exporter/version.rb

@@ -1,3 +1,3 @@
 module RailsLokiExporter
-    VERSION = '1.0.4'
+    VERSION = '1.1.0'
 end 

data/rails_loki_exporter.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
     spec.extra_rdoc_files      = ['README.md']
     spec.require_paths         = ['lib']
     spec.add_dependency        'zeitwerk', '~> 2.4'
-    spec.add_dependency        'rspec'
+    spec.add_development_dependency 'rspec'
+    spec.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_loki_exporter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - planning.how
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -33,7 +33,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: