logtail 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba9fd4e5a7de0392375297a8ac475049499afebb82b904ce43615f1b1c5e000
-  data.tar.gz: 0073e828790ded81976eefb1d42d48e0c9eff3123dc47c4c861960bf9a611ff2
+  metadata.gz: 9bb7693b6aa0c18cdfd743e711bbfb2a07d21e580e3698d9c361a4501aed76a8
+  data.tar.gz: 48b28d5a283ce2fb97221dc9d940f4443ece4f576a6bfa8ddceb0fc8321233bb
 SHA512:
-  metadata.gz: 9c79321cad971e6fa844c08525b6b308594572e728f465561d4f9f594ddb4009047491014f4bc7267292e5d3f3c3d0249e5c0a27d5fb6f7107fd1a79cc10c36e
-  data.tar.gz: 37614b8402998ebfbf9d40741fcbe8085fa4beaf86cd0dfe2b6a2028e08b25a238e26dbd4efb6b5e2406116db2599e135f4f802135d2fc6bbf14e2d3809fcb96
+  metadata.gz: 646bc1896d44fa7704355a9426921a35eda9d34e0f80f8aaa7e35d91adc78fa51ab39fbde249b8835f6045720d6260b08c9687964072c9562dad4053720a9804
+  data.tar.gz: a13480d4db23662178079edd858cf0ceb0fe33f90bdfc5acb178aadc2187e5ee5634b58ac7c5cc6a7c14fcbd367b32f58fa187d9687e22a0741a02ff9121791a

data/CHANGELOG.md

@@ -18,3 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.1.3] - 2021-06-11
 
 - Fixed detection of the frame that calls the logger.
+
+## [0.1.7] - 2021-08-16
+
+- Fixed runtime context's frame label encoding.

data/lib/logtail/log_entry.rb

@@ -120,6 +120,7 @@ module Logtail
 
         calling_frame_index = last_logger_invocation_index + 1
         frame = caller_locations[calling_frame_index]
+        return {} if frame.nil?
 
         return convert_to_runtime_context(frame)
       end
@@ -128,7 +129,7 @@ module Logtail
         {
           file: path_relative_to_app_root(frame),
           line: frame.lineno,
-          frame_label: frame.label,
+          frame_label: frame.label.dup.force_encoding('UTF-8'),
         }
       end
 
@@ -138,13 +139,15 @@ module Logtail
 
       def path_relative_to_app_root(frame)
         Pathname.new(frame.absolute_path).relative_path_from(root_path).to_s
+      rescue
+        frame.absolute_path
       end
 
       def root_path
         if Object.const_defined?('Rails')
-          Rails.root.to_s
+          Rails.root
         elsif Object.const_defined?('Rack::Directory')
-          Rack::Directory.new('').root
+          Pathname.new(Rack::Directory.new('').root)
         else
           base_file = caller_locations.last.absolute_path
           Pathname.new(File.dirname(base_file || '/'))

data/lib/logtail/logger.rb

@@ -34,14 +34,13 @@ module Logtail
         def build_log_entry(severity, time, progname, logged_obj)
           context_snapshot = CurrentContext.instance.snapshot
           level = SEVERITY_MAP.fetch(severity)
-          tags = extract_active_support_tagged_logging_tags
+          tags = extract_active_support_tagged_logging_tags.clone
 
           if logged_obj.is_a?(Event)
             LogEntry.new(level, time, progname, logged_obj.message, context_snapshot, logged_obj,
                          tags: tags)
           elsif logged_obj.is_a?(Hash)
             # Extract the tags
-            tags = tags.clone
             tags.push(logged_obj.delete(:tag)) if logged_obj.key?(:tag)
             tags.concat(logged_obj.delete(:tags)) if logged_obj.key?(:tags)
             tags.uniq!
@@ -56,7 +55,8 @@ module Logtail
 
         # Because of all the crazy ways Rails has attempted tags, we need this crazy method.
         def extract_active_support_tagged_logging_tags
-          Thread.current[:activesupport_tagged_logging_tags] ||
+          @current_tags ||
+            Thread.current[:activesupport_tagged_logging_tags] ||
             Thread.current[tagged_logging_object_key_name] ||
             EMPTY_ARRAY
         end

data/lib/logtail/version.rb

@@ -1,3 +1,3 @@
 module Logtail
-  VERSION = "0.1.3"
+  VERSION = "0.1.7"
 end

data/spec/logtail/log_entry_spec.rb

@@ -30,6 +30,7 @@ describe Logtail::LogEntry do
       expect(hash[:context][:runtime][:file]).to end_with('/spec/logtail/log_entry_spec.rb')
       expect(hash[:context][:runtime][:line]).to be(25)
       expect(hash[:context][:runtime][:frame_label]).to_not be_nil
+      expect(hash[:context][:runtime][:frame_label].encoding.to_s).to eq('UTF-8')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - Logtail
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack