researchable_loggable 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe5ffbeff35ebd66ff13d1e846b709146ca5e2c60b940db355550ebd73e4296
-  data.tar.gz: 34b3aaad1e4a56831893b29b57643797f5f256bea4cb0787a8f9ff66e2dc1bdc
+  metadata.gz: a356ec5967b01443f13f9636b36cfd43c50a1302b19cef806d786681fab6a4a1
+  data.tar.gz: c440471ef3530be9cc5b34bbc36edc500ddb23e3cd44bdee4d47bae793ca99bd
 SHA512:
-  metadata.gz: c3c7d6854c90271dfc8843c4bf05b8558bf23569bdefef96ffbf272e6253588384dbc85d1f9dfe532defcb2b692691ea5bd936685a139732bb597499d5a945c4
-  data.tar.gz: ca852ff5ce276a1033966a881a2273b202c76e27eb7dd0c0b513b13460b93af1d2eab8dee98bfd522f819b94f461c9171ffad893eab6a57a18235922516da35a
+  metadata.gz: 67227dd3e381992a84ed08183ffc635073f5f991c04ab170e41b798c2786c09aa8eb21fd37c6aa81d25c51070e5c5b4a995aaad5f013d40823e1c613b1a4b237
+  data.tar.gz: f896dd740a142d8335f957293324f0b08d7f8695d2499f3fb7759be22be1666dd2a8c790ccb7511321a265a648b2299a52e6b7a3f6313cb8cd0b4e1f4268b737

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.5.0](https://gitlab.com/researchable/general/gems/loggable/compare/v1.4.0...v1.5.0) (2024-12-05)
+
+
+### Features
+
+* use the correct import ([600ff6a](https://gitlab.com/researchable/general/gems/loggable/commit/600ff6a805b559c6a6de375c4c3e39232062a6a0))
+
+# [1.4.0](https://gitlab.com/researchable/general/gems/loggable/compare/v1.3.1...v1.4.0) (2024-11-29)
+
+
+### Features
+
+* add trace and span id ([6e486e0](https://gitlab.com/researchable/general/gems/loggable/commit/6e486e03f7bef1ecf739195d80472f3cf3c2b7f6))
+* replace ecs logging format to logfmt ([19eb571](https://gitlab.com/researchable/general/gems/loggable/commit/19eb571719ed294fed4f94094c091c76470cae53))
+
 ## [1.3.1](https://gitlab.com/researchable/general/gems/loggable/compare/v1.3.0...v1.3.1) (2024-11-26)
 
 

data/Gemfile

@@ -11,7 +11,6 @@ gem 'rspec', '~> 3.0'
 
 gem 'ruboguide', '~> 1.0'
 
-gem 'ecs-logging', '~> 1.0'
 gem 'lograge'
 gem 'logstash-event'
 

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    researchable_loggable (1.2.0)
-      ecs-logging (~> 1.0)
+    researchable_loggable (1.3.1)
       lograge
       logstash-event
       opentelemetry-exporter-otlp (~> 0.28)
@@ -36,7 +35,6 @@ GEM
     concurrent-ruby (1.2.0)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    ecs-logging (1.0.0)
     erubi (1.12.0)
     google-protobuf (4.27.4-x86_64-linux)
       bigdecimal
@@ -335,7 +333,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  ecs-logging (~> 1.0)
   lograge
   logstash-event
   opentelemetry-exporter-otlp (~> 0.28)

data/lib/loggable/logfmt/logger.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'logger'
+require 'time'
+require 'active_support/logger_silence'
+
+module Loggable
+  module Logfmt
+    # A structured logger that formats log messages in a key-value style using Logfmt formatting
+    # This has been adapted from https://github.com/cyberdelia/logfmt-ruby/
+    class Logger < ::Logger
+      def initialize(*args, **kwargs)
+        super
+        @formatter ||= KeyValueFormatter.new
+      end
+
+      # Include the LoggerSilence module to fix the incompatibility with ActiveSupport::LoggerSilence whe
+      # Rails.application.config.assets.quiet option is set to true, but do not include the module for the
+      # test environment as it causes issues with ActiveSupport::LoggerThreadSafeLevel::IsolatedExecutionState.
+      def self.include_logger_silence
+        include ActiveSupport::LoggerSilence
+      end
+
+      # Custom formatter class that renders logs as in a key-value style using Logfmt formatting
+      class KeyValueFormatter < ::Logger::Formatter
+        def call(severity, timestamp, progname, msg)
+          %(time=#{datetime(timestamp)} severity=#{severity.ljust(5)}#{progname(progname)} #{message(msg)}\n)
+        end
+
+        private
+
+        def datetime(time)
+          time.utc.iso8601(3)
+        end
+
+        def message(msg)
+          return unless msg
+
+          if msg.respond_to?(:to_hash)
+            pairs = msg.to_hash.map { |k, v| format_pair(k, v) }
+            pairs.compact.join(' ')
+          else
+            format_pair('message', msg)
+          end
+        end
+
+        def format_pair(key, value)
+          return nil if value.nil?
+
+          # Return a bare key when the value is a `TrueClass`
+          return key if value == true
+
+          "#{key}=#{format_value(value)}"
+        end
+
+        def progname(progname)
+          return nil unless progname
+
+          # Format this pair like any other to ensure quoting, escaping, etc…,
+          # But we also need a leading space so we can interpolate the resulting
+          # key/value pair into our log line.
+          " #{format_pair(' progname', progname)}"
+        end
+
+        def format_value(value)
+          if value.is_a?(Float)
+            format('%.3f', value)
+          elsif value.is_a?(Time)
+            datetime(value)
+          elsif value.respond_to?(:to_ary)
+            format_value(
+              "[#{Array(value).map { |v| format_value(v) }.join(', ')}]"
+            )
+          else
+            # Interpolating due to a weird/subtle behaviour possible in #to_s.
+            # Namely, it's possible it doesn't actually return a String:
+            # https://github.com/ruby/spec/blob/3affe1e54fcd11918a242ad5d4a7ba895ee30c4c/language/string_spec.rb#L130-L141
+            value = "#{value}" # rubocop:disable Style/RedundantInterpolation
+            value = value.dump if value.match?(/[[:space:]]|[[:cntrl:]]/) # wrap in quotes and escape control characters
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/loggable/opentelemetry_config.rb

@@ -2,7 +2,7 @@
 
 require 'opentelemetry/sdk'
 require 'opentelemetry/instrumentation/all'
-require 'opentelemetry/exporter/otlp'
+require 'opentelemetry-exporter-otlp'
 
 module Loggable
   # The OpenTelemetryConfig module provides a method to configure OpenTelemetry for Rails applications.

data/lib/loggable/railtie.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'ecs_logging/logger'
+require 'lograge'
 require 'rails'
+require 'opentelemetry/sdk'
 
 module Loggable
   # Railtie to configure logging before rails starts
@@ -12,13 +13,14 @@ module Loggable
     config.loggable.current_user_method = :current_user
 
     # Initializer runs before initialize_logger (found in Bootstrap) so from the very beginning we are logging using
-    # the ecs format, even during the initialization process
+    # the logfmt format, even during the initialization process
     # rubocop:disable Metrics/BlockLength
     initializer :loggable_web, before: :initialize_logger do
       Rails.application.configure do
         production_like = Rails.env.production? || config.loggable.production_like
         if production_like
-          Rails.logger = ::EcsLogging::Logger.new($stdout)
+          Loggable::Logfmt::Logger.include_logger_silence if Rails.application.config.assets.quiet
+          Rails.logger = Loggable::Logfmt::Logger.new($stdout)
           Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase || 'INFO')
 
           Loggable::OpenTelemetryConfig.configure(Rails.application.class.module_parent_name.underscore.dasherize)
@@ -32,22 +34,26 @@ module Loggable
           if controller.respond_to?(config.loggable.current_user_method)
             user_id = controller.send(config.loggable.current_user_method).try(:id)
           end
+
           {
-            ecs: {
-              'source.ip': controller.request.ip,
-              'user.id': user_id,
-              'http.code': response_code
-            },
-            status: response_code
+            'source.ip': controller.request.ip,
+            'user.id': user_id,
+            status: response_code,
+            span_id: OpenTelemetry::Trace.current_span.context.hex_span_id,
+            trace_id: OpenTelemetry::Trace.current_span.context.hex_trace_id
           }
         end
         config.lograge.custom_options = lambda do |event|
           return if event.payload[:params].blank?
 
           exceptions = %w[controller action format id]
-          { params: event.payload[:params].except(*exceptions) }
+          params = event.payload[:params].except(*exceptions)
+          # append a suffix to each param
+          params.each_with_object({}) do |(key, value), result|
+            result["params.#{key}"] = value
+          end
         end
-        config.lograge.formatter = Loggable::Lograge::Formatter.new if production_like
+        config.lograge.formatter = ::Lograge::Formatters::Raw.new
       end
     end
     # rubocop:enable Metrics/BlockLength
@@ -56,7 +62,7 @@ module Loggable
       Rails.application.configure do
         if defined?(Delayed::Worker)
           if Rails.env.production? || config.loggable.production_like
-            Delayed::Worker.logger = ::EcsLogging::Logger.new($stdout)
+            Delayed::Worker.logger = Loggable::Logfmt::Logger.new($stdout)
             Delayed::Worker.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase || 'INFO')
             Loggable::OpenTelemetryConfig.configure("#{Rails.application.class.module_parent_name.underscore.dasherize}
                                                     -worker")

data/lib/loggable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loggable
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/lib/researchable_loggable.rb

@@ -3,8 +3,7 @@
 require_relative 'loggable/version'
 require_relative 'loggable/railtie' if defined?(Rails::Railtie)
 require_relative 'loggable/opentelemetry_config'
-require_relative 'loggable/ecs_logging/formatter_monkey_patch'
-require_relative 'loggable/lograge/formatter'
+require_relative 'loggable/logfmt/logger'
 
 module ResearchableLoggable
   class Error < StandardError

data/node_modules/semantic-release-rubygem/src/__tests__/fixtures/valid/lib/test-gem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestGem
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/concurrent-ruby-1.2.0/lib/concurrent-ruby/concurrent/version.rb

@@ -1,3 +1,3 @@
 module Concurrent
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/crass-1.0.6/lib/crass/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Crass
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/lograge-0.12.0/lib/lograge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lograge
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/method_source-1.0.0/lib/method_source/version.rb

@@ -1,3 +1,3 @@
 module MethodSource
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-api-1.3.0/lib/opentelemetry/version.rb

@@ -6,5 +6,5 @@
 
 module OpenTelemetry
   ## Current OpenTelemetry version
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-common-0.21.0/lib/opentelemetry/common/version.rb

@@ -6,6 +6,6 @@
 
 module OpenTelemetry
   module Common
-    VERSION = '1.3.1'
+    VERSION = '1.5.0'
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-exporter-otlp-0.28.1/lib/opentelemetry/exporter/otlp/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module OTLP
       ## Current OpenTelemetry OTLP exporter version
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-helpers-mysql-0.1.1/lib/opentelemetry/helpers/mysql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module MySQL
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-helpers-sql-obfuscation-0.2.0/lib/opentelemetry/helpers/sql_obfuscation/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module SqlObfuscation
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-action_mailer-0.1.0/lib/opentelemetry/instrumentation/action_mailer/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionMailer
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-action_pack-0.9.0/lib/opentelemetry/instrumentation/action_pack/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-action_view-0.7.3/lib/opentelemetry/instrumentation/action_view/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionView
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-active_job-0.7.7/lib/opentelemetry/instrumentation/active_job/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveJob
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-active_model_serializers-0.20.2/lib/opentelemetry/instrumentation/active_model_serializers/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveModelSerializers
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-active_record-0.7.4/lib/opentelemetry/instrumentation/active_record/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-active_support-0.6.0/lib/opentelemetry/instrumentation/active_support/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveSupport
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-all-0.63.0/lib/opentelemetry/instrumentation/all/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-aws_lambda-0.1.1/lib/opentelemetry/instrumentation/aws_lambda/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module AwsLambda
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-aws_sdk-0.5.4/lib/opentelemetry/instrumentation/aws_sdk/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module AwsSdk
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-base-0.22.6/lib/opentelemetry/instrumentation/version.rb

@@ -6,6 +6,6 @@
 
 module OpenTelemetry
   module Instrumentation
-    VERSION = '1.3.1'
+    VERSION = '1.5.0'
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-bunny-0.21.4/lib/opentelemetry/instrumentation/bunny/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Bunny
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-concurrent_ruby-0.21.4/lib/opentelemetry/instrumentation/concurrent_ruby/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ConcurrentRuby
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-dalli-0.25.4/lib/opentelemetry/instrumentation/dalli/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Dalli
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-delayed_job-0.22.4/lib/opentelemetry/instrumentation/delayed_job/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module DelayedJob
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-ethon-0.21.8/lib/opentelemetry/instrumentation/ethon/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Ethon
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-excon-0.22.4/lib/opentelemetry/instrumentation/excon/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Excon
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-faraday-0.24.6/lib/opentelemetry/instrumentation/faraday/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Faraday
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-grape-0.2.0/lib/opentelemetry/instrumentation/grape/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Grape
       # Current gem version
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-graphql-0.28.4/lib/opentelemetry/instrumentation/graphql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-gruf-0.2.1/lib/opentelemetry/instrumentation/gruf/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Gruf
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-http-0.23.4/lib/opentelemetry/instrumentation/http/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module HTTP
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-http_client-0.22.7/lib/opentelemetry/instrumentation/http_client/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module HttpClient
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-koala-0.20.5/lib/opentelemetry/instrumentation/koala/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Koala
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-lmdb-0.22.3/lib/opentelemetry/instrumentation/lmdb/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module LMDB
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-mongo-0.22.4/lib/opentelemetry/instrumentation/mongo/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Mongo
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-mysql2-0.27.2/lib/opentelemetry/instrumentation/mysql2/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Mysql2
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-net_http-0.22.7/lib/opentelemetry/instrumentation/net/http/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Net
       module HTTP
-        VERSION = '1.3.1'
+        VERSION = '1.5.0'
       end
     end
   end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-pg-0.28.0/lib/opentelemetry/instrumentation/pg/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module PG
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-que-0.8.4/lib/opentelemetry/instrumentation/que/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Que
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-racecar-0.3.4/lib/opentelemetry/instrumentation/racecar/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Racecar
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-rack-0.24.6/lib/opentelemetry/instrumentation/rack/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rack
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-rails-0.31.2/lib/opentelemetry/instrumentation/rails/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rails
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-rake-0.2.2/lib/opentelemetry/instrumentation/rake/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rake
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-rdkafka-0.4.8/lib/opentelemetry/instrumentation/rdkafka/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rdkafka
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-redis-0.25.7/lib/opentelemetry/instrumentation/redis/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Redis
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-resque-0.5.2/lib/opentelemetry/instrumentation/resque/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Resque
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-restclient-0.22.7/lib/opentelemetry/instrumentation/restclient/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RestClient
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-ruby_kafka-0.21.3/lib/opentelemetry/instrumentation/ruby_kafka/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RubyKafka
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-sidekiq-0.25.7/lib/opentelemetry/instrumentation/sidekiq/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sidekiq
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-sinatra-0.24.1/lib/opentelemetry/instrumentation/sinatra/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sinatra
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-instrumentation-trilogy-0.59.3/lib/opentelemetry/instrumentation/trilogy/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-registry-0.3.1/lib/opentelemetry/instrumentation/registry/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     class Registry
-      VERSION = '1.3.1'
+      VERSION = '1.5.0'
     end
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-sdk-1.5.0/lib/opentelemetry/sdk/version.rb

@@ -7,6 +7,6 @@
 module OpenTelemetry
   module SDK
     ## Current OpenTelemetry version
-    VERSION = '1.3.1'
+    VERSION = '1.5.0'
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/opentelemetry-semantic_conventions-1.10.1/lib/opentelemetry/semantic_conventions/version.rb

@@ -6,6 +6,6 @@
 
 module OpenTelemetry
   module SemanticConventions
-    VERSION = '1.3.1'
+    VERSION = '1.5.0'
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/rack-test-2.0.2/lib/rack/test/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Test
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/regexp_parser-2.7.0/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   class Parser
-    VERSION = '1.3.1'
+    VERSION = '1.5.0'
   end
 end

data/vendor/ruby/ruby/3.2.0/gems/ruboguide-1.0.0/lib/ruboguide/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruboguide
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

data/vendor/ruby/ruby/3.2.0/gems/ruby-progressbar-1.13.0/lib/ruby-progressbar/version.rb

@@ -1,3 +1,3 @@
 class ProgressBar
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/vendor/ruby/ruby/3.2.0/gems/tzinfo-2.0.6/lib/tzinfo/version.rb

@@ -3,5 +3,5 @@
 
 module TZInfo
   # The TZInfo version number.
-  VERSION = '1.3.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: researchable_loggable
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Researchable
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ecs-logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +100,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/loggable/ecs_logging/formatter_monkey_patch.rb
-- lib/loggable/lograge/formatter.rb
+- lib/loggable/logfmt/logger.rb
 - lib/loggable/opentelemetry_config.rb
 - lib/loggable/railtie.rb
 - lib/loggable/version.rb
@@ -135,7 +120,6 @@ files:
 - vendor/ruby/ruby/3.2.0/gems/bundler-2.4.6/lib/bundler/version.rb
 - vendor/ruby/ruby/3.2.0/gems/concurrent-ruby-1.2.0/lib/concurrent-ruby/concurrent/version.rb
 - vendor/ruby/ruby/3.2.0/gems/crass-1.0.6/lib/crass/version.rb
-- vendor/ruby/ruby/3.2.0/gems/ecs-logging-1.0.0/lib/ecs_logging/version.rb
 - vendor/ruby/ruby/3.2.0/gems/googleapis-common-protos-types-1.15.0/lib/googleapis/common/protos/types/version.rb
 - vendor/ruby/ruby/3.2.0/gems/i18n-1.12.0/lib/i18n/version.rb
 - vendor/ruby/ruby/3.2.0/gems/lograge-0.12.0/lib/lograge/version.rb
@@ -220,13 +204,13 @@ files:
 - vendor/ruby/ruby/3.2.0/gems/thor-1.2.1/lib/thor/version.rb
 - vendor/ruby/ruby/3.2.0/gems/tzinfo-2.0.6/lib/tzinfo/version.rb
 - vendor/ruby/ruby/3.2.0/gems/zeitwerk-2.6.7/lib/zeitwerk/version.rb
-homepage: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.3.1/README.md
+homepage: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.5.0/README.md
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.3.1/README.md
+  homepage_uri: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.5.0/README.md
   source_code_uri: https://gitlab.com/researchable/general/gems/loggable
-  changelog_uri: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.3.1/CHANGELOG.md
+  changelog_uri: https://gitlab.com/researchable/general/gems/loggable/-/blob/v1.5.0/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/loggable/ecs_logging/formatter_monkey_patch.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'ecs_logging/formatter'
-
-module Loggable
-  module EcsLogging
-    # A monkey patch to the ::EcsLogging::Formatter to customize how messages from lograge are rendered
-    module FormatterMonkeyPatch
-      def call(severity, time, progname, msg, **extras)
-        base = {
-          '@timestamp': time.utc.iso8601(3),
-          'log.level': severity,
-          message: msg,
-          'ecs.version': '1.4.0'
-        }
-
-        base['log.logger'] = progname if progname
-
-        base.merge!(msg.except(:lograge)) if msg.is_a?(Hash) && msg.key?(:lograge)
-        base.merge!(extras) if extras
-
-        "#{JSON.fast_generate(base)}\n"
-      end
-
-      class << self
-        def apply_patch
-          const = find_const
-          mtd = find_method(const)
-
-          # byebug
-          const.prepend(self) if const && mtd && mtd.arity == -5
-        end
-
-        private
-
-        def find_const
-          Kernel.const_get('::EcsLogging::Formatter')
-        rescue NameError
-          puts '[WARN] ::EcsLogging::Formatter not found. Patch could not be applied.' # rubocop:disable Rails/Output
-        end
-
-        def find_method(const)
-          return unless const
-
-          method_name = :call
-          const.instance_method(method_name)
-        rescue NameError
-          puts "[WARN] '#{method_name}' method not found in '#{const}'. Patch could not be applied." # rubocop:disable Rails/Output
-        end
-      end
-    end
-  end
-end
-
-Loggable::EcsLogging::FormatterMonkeyPatch.apply_patch

data/lib/loggable/lograge/formatter.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'lograge'
-require 'active_support/core_ext/array'
-
-module Loggable
-  module Lograge
-    # Custom formatter class that renders logs as ruby objects with just the ecs fields generated by the logger, the
-    # message, and a lograge flag so the ECS logger knows to process this further before rendering
-    class Formatter < ::Lograge::Formatters::KeyValue
-      def call(data)
-        (data[:ecs] || {}).merge(message: super(data), lograge: true)
-      end
-
-      protected
-
-      def fields_to_display(data)
-        data.keys.excluding(%i[ecs])
-      end
-    end
-  end
-end

data/vendor/ruby/ruby/3.2.0/gems/ecs-logging-1.0.0/lib/ecs_logging/version.rb

@@ -1,22 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# frozen_string_literal: true
-
-module EcsLogging
-  VERSION = "1.0.0"
-end