plain_apm 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e496879797c3c3bedfeea9f641b9f113bae2104b6a3c69bb67fdd6cfd8734af6
-  data.tar.gz: 484e1217d8d459ccf6c3619da23730c2126094136648a6c8fe15f5dbb63962b1
+  metadata.gz: 5d7ba5044b9386fbcbfb252e35649da1ad0b7573880510e0588323e24cf0bc11
+  data.tar.gz: 0ae2df2fea0bdbfc798be93a739a5b6d9144db045f38905feddd5e0975d852fd
 SHA512:
-  metadata.gz: '052286dd61178482ed0c794f0486d28d21914bb250a77b86ec408599a25d6b6198baa844f34678ec6094ad84f3d3ec37ff2a5761ec89286527d19676ed1b7ef5'
-  data.tar.gz: 51b7cbc86ff0c6c8595ffde40361713f41e206d0d73f63ef0bb8270454a3a62af16e5851a789c2c9c2367cb8ade92e36324d9acaca64bd1784cf81fe486ddf15
+  metadata.gz: f8af4f98d0e30a361e8c2aaf5ef6a3e31d5e1c533ea74b5bebcb03fde4069ef70d8ad9e8067d3c2d99bcaac0e1a73a03f847ef0b80c3ee6bea2be89c4829ec35
+  data.tar.gz: 007fab263d50573c67f710854ad60a6a3b4392e71599de2b6ed5f287bd63f7814e457c281f9135f130f78446b25af97be1669dcbc8d8ba731f78c16591d094ec

data/Rakefile

@@ -4,6 +4,7 @@ require "bundler/gem_tasks"
 require "appraisal"
 require "standard/rake"
 require "rake/testtask"
+require "rake/extensiontask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -11,6 +12,8 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+Rake::ExtensionTask.new("object_tracing")
+
 namespace :test do
   task all: "appraisal:all"
 end

data/ext/object_tracing/extconf.rb

@@ -0,0 +1,6 @@
+require 'mkmf'
+
+have_header('ruby/ruby.h') or missing('ruby/ruby.h')
+have_header('ruby/debug.h') or missing('ruby/debug.h')
+
+create_makefile('object_tracing')

data/ext/object_tracing/object_tracing.c

@@ -0,0 +1,25 @@
+#include <ruby/ruby.h>
+#include <ruby/debug.h>
+
+static __thread uint64_t allocated_objects = 0;
+
+static VALUE rb_mPlainApm;
+static VALUE rb_mObjTracing;
+
+static VALUE total_thread_allocated_objects(VALUE self) {
+  return ULL2NUM(allocated_objects);
+}
+
+static void track_thread_allocated_objects(VALUE tpval, void *data) {
+  allocated_objects++;
+}
+
+void Init_object_tracing(void) {
+  rb_mPlainApm = rb_define_module("PlainApm");
+  rb_mObjTracing = rb_define_module_under(rb_mPlainApm, "ObjectTracing");
+
+  rb_define_module_function(rb_mObjTracing, "total_thread_allocated_objects", total_thread_allocated_objects, 0);
+
+  VALUE tpval = rb_tracepoint_new(0, RUBY_INTERNAL_EVENT_NEWOBJ, track_thread_allocated_objects, NULL);
+  rb_tracepoint_enable(tpval);
+}

data/lib/plain_apm/agent.rb

@@ -72,7 +72,8 @@ module PlainApm
         Hooks::ActionView,
         Hooks::ActiveJob,
         Hooks::ActiveRecord,
-        Hooks::ErrorReporter
+        Hooks::ErrorReporter,
+        Hooks::Manual
       ].map(&:new).each(&:install)
     end
 

data/lib/plain_apm/extensions/thread_allocations.rb

@@ -0,0 +1,35 @@
+module PlainApm
+  module Extensions
+    module ThreadAllocations
+      def start!
+        super
+        @thread_allocation_count_start = now_thread_allocations
+      end
+
+      def finish!
+        super
+        @thread_allocation_count_finish = now_thread_allocations
+      end
+
+      def thread_allocations
+        @thread_allocation_count_finish - @thread_allocation_count_start
+      end
+
+      private
+
+      if defined?(PlainApm::ObjectTracing)
+        def now_thread_allocations
+          PlainApm::ObjectTracing.total_thread_allocated_objects
+        end
+      else
+        def now_thread_allocations
+          0
+        end
+      end
+    end
+
+    if defined?(ActiveSupport)
+      ActiveSupport::Notifications::Event.prepend(PlainApm::Extensions::ThreadAllocations)
+    end
+  end
+end

data/lib/plain_apm/helpers.rb

@@ -0,0 +1,12 @@
+module PlainApm
+  module Helpers
+    def plain_apm_context(context = {})
+      PlainApm::Extensions::Context.context.merge!(context)
+    end
+
+    def plain_apm_instrument(name, context = {}, &block)
+      sanitized_name = name.gsub(/\W/, "_").gsub(/(?!^)([A-Z])/) { |m| "_#{m}" }.gsub(/_+/, "_").downcase
+      ActiveSupport::Notifications.instrument("#{sanitized_name}.manual.plain_apm", **context, &block)
+    end
+  end
+end

data/lib/plain_apm/hooks/action_mailer.rb

@@ -20,6 +20,7 @@ module PlainApm
           "name" => name,
           "backtrace" => filtered_backtrace,
           "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
           "started_at" => event.time,
           "finished_at" => event.end
         }

data/lib/plain_apm/hooks/action_pack.rb

@@ -20,6 +20,7 @@ module PlainApm
           "name" => name,
           "backtrace" => filtered_backtrace,
           "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
           "started_at" => event.time,
           "finished_at" => event.end
         }

data/lib/plain_apm/hooks/action_view.rb

@@ -21,7 +21,8 @@ module PlainApm
           "backtrace" => filtered_backtrace,
           "started_at" => event.time,
           "finished_at" => event.end,
-          "allocations" => event.allocations
+          "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations
         }
 
         case name

data/lib/plain_apm/hooks/active_job.rb

@@ -23,6 +23,7 @@ module PlainApm
           "started_at" => event.time,
           "finished_at" => event.end,
           "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
           "queue_name" => job.queue_name,
           "job_id" => job.job_id,
           "job_class" => job.class.name,

data/lib/plain_apm/hooks/active_record.rb

@@ -23,7 +23,8 @@ module PlainApm
           "backtrace" => filtered_backtrace,
           "started_at" => event.time,
           "finished_at" => event.end,
-          "allocations" => event.allocations
+          "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations
         }
 
         case name

data/lib/plain_apm/hooks/deploy.rb

@@ -18,7 +18,13 @@ module PlainApm
         tool, revision = *result
 
         Agent.instance.collect(
-          {"source" => tool, "revision" => revision, "name" => "deploy"}
+          {
+            "source" => tool,
+            "revision" => revision,
+            "name" => "deploy",
+            "started_at" => Time.now.to_f,
+            "finished_at" => Time.now.to_f
+          }
         )
       end
 

data/lib/plain_apm/hooks/manual.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module PlainApm
+  module Hooks
+    class Manual < ActiveSupportSubscriber
+      NOTIFICATION_PATTERN = /\A[^!]\w+\.manual\.plain_apm\Z/.freeze
+
+      private
+
+      def notification_pattern
+        NOTIFICATION_PATTERN
+      end
+
+      def payload(event)
+        name, source, _ = *event.name.split(".")
+
+        {
+          "source" => source,
+          "name" => name,
+          "backtrace" => filtered_backtrace,
+          "started_at" => event.time,
+          "finished_at" => event.end,
+          "allocations" => event.allocations,
+          "thread_allocations" => event.thread_allocations,
+          "payload" => event.payload
+        }
+      end
+    end
+  end
+end

data/lib/plain_apm/version.rb

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

data/lib/plain_apm.rb

@@ -5,6 +5,8 @@ require_relative "plain_apm/transport"
 require_relative "plain_apm/config"
 require_relative "plain_apm/agent"
 
+require "object_tracing"
+
 require_relative "plain_apm/hooks/deploy"
 
 # Rails extensions
@@ -12,10 +14,11 @@ begin
   require "rack/body_proxy"
 
   require_relative "plain_apm/extensions/context"
-  require_relative "plain_apm/extensions/context/helpers"
   require_relative "plain_apm/extensions/context/middleware"
   require_relative "plain_apm/extensions/context/active_job" if defined?(ActiveSupport)
   require_relative "plain_apm/extensions/context/railtie" if defined?(Rails::Railtie)
+  require_relative "plain_apm/extensions/thread_allocations"
+  require_relative "plain_apm/helpers"
 rescue LoadError
   nil
 end
@@ -31,6 +34,7 @@ require_relative "plain_apm/hooks/action_pack"
 require_relative "plain_apm/hooks/action_view"
 require_relative "plain_apm/hooks/active_job"
 require_relative "plain_apm/hooks/active_record"
+require_relative "plain_apm/hooks/manual"
 require_relative "plain_apm/hooks/error_reporter"
 
 module PlainApm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  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
@@ -70,7 +84,8 @@ description: Ruby gem to collect events/metrics and send them to PlainAPM.
 email:
 - support@plainapm.com
 executables: []
-extensions: []
+extensions:
+- ext/object_tracing/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
@@ -78,6 +93,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/object_tracing/extconf.rb
+- ext/object_tracing/object_tracing.c
 - lib/plain_apm.rb
 - lib/plain_apm/agent.rb
 - lib/plain_apm/backoff.rb
@@ -85,12 +102,13 @@ files:
 - lib/plain_apm/extensions/context.rb
 - lib/plain_apm/extensions/context/LICENSE.txt
 - lib/plain_apm/extensions/context/active_job.rb
-- lib/plain_apm/extensions/context/helpers.rb
 - lib/plain_apm/extensions/context/middleware.rb
 - lib/plain_apm/extensions/context/railtie.rb
 - lib/plain_apm/extensions/exceptions/active_job.rb
 - lib/plain_apm/extensions/exceptions/rack.rb
 - lib/plain_apm/extensions/exceptions/railtie.rb
+- lib/plain_apm/extensions/thread_allocations.rb
+- lib/plain_apm/helpers.rb
 - lib/plain_apm/hooks/action_mailer.rb
 - lib/plain_apm/hooks/action_pack.rb
 - lib/plain_apm/hooks/action_view.rb
@@ -99,6 +117,7 @@ files:
 - lib/plain_apm/hooks/active_support_subscriber.rb
 - lib/plain_apm/hooks/deploy.rb
 - lib/plain_apm/hooks/error_reporter.rb
+- lib/plain_apm/hooks/manual.rb
 - lib/plain_apm/transport.rb
 - lib/plain_apm/version.rb
 homepage: https://plainapm.com

data/lib/plain_apm/extensions/context/helpers.rb

@@ -1,11 +0,0 @@
-module PlainApm
-  module Extensions
-    module Context
-      module Helpers
-	def plain_apm_context(context = {})
-	  PlainApm::Extensions::Context.context.merge!(context)
-	end
-      end
-    end
-  end
-end