plain_apm 0.9.8 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d2d8915ce85d5a10557fd615a6011840b329155bc0d8765c1a5cef05383bc3
-  data.tar.gz: e9473490d411042af5e1cc04d7374ebb6b8f7b5c07aebaaa0bda604ca0bfb3a2
+  metadata.gz: 380c7c5a078b9d9b650e66ea7daa26109e3a028af6733c845da95784a9848351
+  data.tar.gz: 4e72c60ed9f5bf063802d27c8b98fe63b236d74eed7b06e9c9aa0bcc0f0d175d
 SHA512:
-  metadata.gz: 7230625a30f50a3777ba5364544979b3edf1718b752836791b4c66997bb4988ca3e8311b1a11ddbefd8de4c0c80f2bae6761532fc0a08567d7b09b67d65a2062
-  data.tar.gz: ff5e0376280f779a9ce2e4cd8cab148d61bf87c8280406b43a71aa409c63974d149afd727540774e564c9d383788d69b9cc533d90bd64849e86ff8f6763db536
+  metadata.gz: bb81d0e597f83f1fe6389fc1732a7c165d69d3e3369ac2b73152de6566ef5c06e1002d910b4dc6b46e0f69b44c4bfb72c33540b62910f3dbc6db8b0b023655fb
+  data.tar.gz: 4a371c933a3dae7778c80b1f01479048194e60f61929b7fab3eff0b5dffc69144df419f1b92f65545a16a014dade2d4bb318ec33480bd4b885eb02a0d620b074

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/config.rb

@@ -19,11 +19,11 @@ module PlainApm
     end
 
     def key_present?
-      ENV["PLAIN_APM_APP_KEY"] != ""
+      ENV["PLAIN_APM_APP_KEY"].to_s != ""
     end
 
     def production?
-      (ENV["RAILS_ENV"] || ENV["RACK_ENV"]) == "production"
+      (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"]) == "production"
     end
 
     def interactive?

data/lib/plain_apm/deploy_tracking.rb

@@ -16,7 +16,7 @@ module PlainApm
       end
 
       def heroku_revision
-        rev = ENV["HEROKU_SLUG_COMMIT"].to_s[0..8]
+        rev = ENV.fetch("GIT_REV", ENV.fetch("HEROKU_SLUG_COMMIT", ""))[0...8]
         rev if !rev.empty?
       end
 

data/lib/plain_apm/event_attributes.rb

@@ -17,9 +17,9 @@ module PlainApm
     ].freeze
 
     def attributes_from_exception(e, context, error_source)
-      source = "exception"
+      name = "exception"
 
-      return [source, nil] if IGNORED_EXCEPTIONS.include?(e.class.name)
+      return [name, nil] if IGNORED_EXCEPTIONS.include?(e.class.name)
 
       attrs = context_attributes
 
@@ -67,7 +67,7 @@ module PlainApm
 
       add_trace_attributes(attrs)
 
-      [source, attrs]
+      [name, attrs]
     end
 
     def attributes_from_notification(event)

data/lib/plain_apm/extensions/exceptions/rack.rb

@@ -25,12 +25,12 @@ module PlainApm
         private
 
         def report_exception(e, env)
-          source, event = attributes_from_exception(e, {env: env}, nil)
+          name, event = attributes_from_exception(e, {env: env}, nil)
 
           return if event.nil?
 
-          event[:source] = source
-          event[:name] = "rack_middleware"
+          event[:source] = "rack_middleware"
+          event[:name] = name
 
           PlainApm.agent.collect(event)
         end

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/hooks/error_reporter.rb

@@ -23,12 +23,12 @@ module PlainApm
       end
 
       def collect(e, handled:, severity:, context: {}, source: nil)
-        event_source, event = attributes_from_exception(e, context, source)
+        name, event = attributes_from_exception(e, context, source)
 
         return if event.nil?
 
-        event[:source] = event_source
-        event[:name] = "error_reporter"
+        event[:source] = "error_reporter"
+        event[:name] = name
 
         ::PlainApm.agent.collect(event)
       end

data/lib/plain_apm/transport.rb

@@ -92,7 +92,8 @@ module PlainApm
 
       {
         "Content-Type" => "application/json, charset=UTF-8",
-        "Content-Encoding" => "gzip",
+        "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.9.8"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.1
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-05-11 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