plain_apm 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f234cdb0d7afa540ac0ae06405ca89a2476bf4e18a44062aebe6fda4868b8b63
-  data.tar.gz: 1c3b2039cd4ce11b9d26d23a1dda6c9fba208fb2e3e8c50bccb0947e1f0161da
+  metadata.gz: 3c48770b73fc39349e83183e81f882964eee3504efb2828ca524651f6df8fcce
+  data.tar.gz: c591759e668fce2402e67b4d49cd2b91b2d74304f73f4979bad5862832455b79
 SHA512:
-  metadata.gz: 7695a907666719056596c427615ca736b39e19a09ee5de97d6999eaec49a55b0a41853e6796076e5acc5e6433f3b8378cab802eadd682b27070b7e3bfe260a51
-  data.tar.gz: d2ce1c8a4e12681f661c3b09307a32211cfcb3e65d449bb00f90b995bdb5ed4d9726db2edc6722e1d4a9c97a2035d3b6cc1f75d3e1767bf6f0baacdcfba71a36
+  metadata.gz: 202d04c8ddf30432c613bcda9abe0a6abb0b73de9fb0a40b57181cdd4e264837b20c641948f867955699227e726e369687454b9a0c8e5d1a00c0f5d4485c9aaa
+  data.tar.gz: c16dc0de9bb7bfa110eddb680d0a96da964a5a0ef98bcd1c4c75ea6fcb4f3adc4623bc9e0c7c9621e8a738f87986a5cb33f3cfe4341bb8a115e7b996609c3231

data/ext/object_tracing/object_tracing.c

@@ -1,14 +1,19 @@
 #include <ruby/ruby.h>
 #include <ruby/debug.h>
 
+/* Pre-ruby 3.1 compatibility */
+#ifndef RBOOL
+#define RBOOL(v) ((v) ? Qtrue : Qfalse)
+#endif
+
 static VALUE rb_mPlainApm = Qnil;
 static VALUE rb_mObjTracing = Qnil;
 
 static __thread uint64_t allocated_objects = 0;
 
-#ifdef OBJECT_TRACING_ENABLED
 static int object_tracing_active = 0;
 
+#ifdef OBJECT_TRACING_ENABLED
 static void track_thread_allocated_objects(VALUE tpval, void *data) {
   allocated_objects++;
 }
@@ -18,6 +23,10 @@ static VALUE total_thread_allocated_objects(VALUE self) {
   return ULL2NUM(allocated_objects);
 }
 
+static VALUE thread_allocated_objects_tracing_enabled(VALUE self) {
+  return RBOOL(object_tracing_active);
+}
+
 void Init_object_tracing(void) {
   rb_mPlainApm = rb_define_module("PlainApm");
   rb_gc_register_address(&rb_mPlainApm);
@@ -26,6 +35,7 @@ void Init_object_tracing(void) {
   rb_gc_register_address(&rb_mObjTracing);
 
   rb_define_singleton_method(rb_mObjTracing, "total_thread_allocated_objects", total_thread_allocated_objects, 0);
+  rb_define_singleton_method(rb_mObjTracing, "thread_allocated_objects_tracing_enabled", thread_allocated_objects_tracing_enabled, 0);
 
 #ifdef OBJECT_TRACING_ENABLED
   /* Ensure the tracepoint is attached only once. */

data/lib/plain_apm/event_attributes.rb

@@ -27,6 +27,9 @@ module PlainApm
       attrs[:message] = e.message
       attrs[:backtrace] = e.backtrace
 
+      attrs[:event_time] = now
+      attrs[:event_utc_time] = utc_now
+
       if error_source
         attrs[:event_source] = error_source
       end
@@ -83,6 +86,10 @@ module PlainApm
       attrs[:event_time] = event.time
       attrs[:duration] = event.duration
 
+      if event.respond_to?(:utc_time)
+        attrs[:event_utc_time] = event.utc_time
+      end
+
       if event.respond_to?(:gc_time)
         attrs[:gc_time] = event.gc_time
       end
@@ -115,7 +122,7 @@ module PlainApm
     # https://bugs.ruby-lang.org/issues/19443 for the feature.
     def add_trace_attributes(attrs)
       attrs[:thread_id] = Thread.current.object_id
-      attrs[:collected_at] = Time.now.to_f
+      attrs[:collected_at] = utc_now
       attrs[:pid] = Process.pid
       attrs[:version] = PlainApm::VERSION
       attrs[:hostname] = cached_attributes[:hostname]
@@ -156,6 +163,14 @@ module PlainApm
       nil
     end
 
+    def now
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+    end
+
+    def utc_now
+      Time.now.to_f
+    end
+
     def self.included(other)
       other.class_eval do
         def self.rails_root

data/lib/plain_apm/extensions/active_support/event.rb

@@ -4,6 +4,7 @@ module PlainApm
       module Event
         def start!
           super
+          @utc_start = utc_now
           @thread_allocation_count_start = now_thread_allocations
           @gc_time_start = now_gc_time
           @gc_major_count_start = now_gc_major_count
@@ -34,6 +35,10 @@ module PlainApm
           @gc_minor_count_finish - @gc_minor_count_start
         end
 
+        def utc_time
+          @utc_start
+        end
+
         private
 
         # Per thread GC counter
@@ -71,6 +76,10 @@ module PlainApm
             0
           end
         end
+
+        def utc_now
+          Time.now.to_f
+        end
       end
     end
   end

data/lib/plain_apm/hooks/action_pack.rb

@@ -26,7 +26,12 @@ module PlainApm
             o[:path] = payload[:path]
             o[:status] = payload[:status]
           end
-        when "redirect_to", "start_processing", "halted_callback", "send_file", "send_data"
+        when "start_processing"
+          base.tap do |o|
+            o[:controller] = payload[:controller]
+            o[:action] = payload[:action]
+          end
+        when "redirect_to", "halted_callback", "send_file", "send_data"
           nil
         when "read_fragment", "write_fragment", "exist_fragment?", "expire_fragment"
           # controller, action, key

data/lib/plain_apm/hooks/active_support_subscriber.rb

@@ -30,6 +30,9 @@ module PlainApm
       end
 
       def collect(event)
+        # drop immediately if there's no ongoing transaction
+        return if PlainApm::Extensions::Context.trace_id.nil?
+
         # id / transaction_id is by instrumenter and thread
         payload = payload(event)
 

data/lib/plain_apm/transport.rb

@@ -93,6 +93,7 @@ module PlainApm
       {
         "Content-Type" => "application/json, charset=UTF-8",
         "Content-Encoding" => "deflate",
+        "X-PlainApm-Version" => PlainApm::VERSION,
         "X-PlainApm-Key" => app_key
       }.merge(meta_headers)
     end

data/lib/plain_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainApm
-  VERSION = "0.10.0"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: PlainAPM agent