plain_apm 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee5efa350c8782a6fc88fe147db4b6ac09779e441fc2fc28da05e6214f904a5
-  data.tar.gz: cdcaacfaca4c36433bc9c52286657b1defaeacde3dcfa1e95a588da09edaffa3
+  metadata.gz: 86351e7cfbfef5b9e4916152f8f7638f3d25ec63eea2228552a7ed18a30af210
+  data.tar.gz: 3e2054248c4affa80a1a563fb340310fbeeac0d75caf9fc77dadcf1c14a9f975
 SHA512:
-  metadata.gz: 9d2c951ee9987ab9c73ef70e5a4e5fe1332b5ee569f91759d9a052ed5dcc1006463ec4c7e0e67baf29230aba9aa95c47698fde3f988e27b43e8e7958dc8be560
-  data.tar.gz: 43b8f5e9b5563b49566bd04052bb3a9fc04bdc6182c2315b3694a0783f17762c187ffdf8b39ef2f0ca322cb1ca824b0192be491bc59a5bb1776b709d4b1f5854
+  metadata.gz: 594f73225b32f2b172251c848b176c1c8fc1370a45d0804bd3741be82eff94cb26fc5526d290127591c274ee886723782890bc1be095b00b158f85331c366f2c
+  data.tar.gz: 6435cb48e14b99c36b1457e28eb343a65618cbda9a0a014e15031b3e08b17aa6da0e15dd3cffa5808df4b44d5db19b180c102103320c231b95d1da1a39bf14c2

data/lib/plain_apm/agent.rb

@@ -71,7 +71,6 @@ module PlainApm
 
     def hooks
       @hooks ||= [
-        Hooks::Deploy,
         Hooks::ActionMailer,
         Hooks::ActionPack,
         Hooks::ActionView,

data/lib/plain_apm/deploy_tracking.rb

@@ -0,0 +1,32 @@
+module PlainApm
+  class DeployTracking
+    class << self
+      def revision
+        git_revision || hg_revision || heroku_revision
+      end
+
+      private
+
+      def git_revision
+        return unless File.exist?(".git")
+        rev = `git rev-parse --short=8 HEAD`.strip
+        rev if !rev.empty?
+      rescue Error::ENOENT # No git installed
+        nil
+      end
+
+      def heroku_revision
+        rev = ENV["HEROKU_SLUG_COMMIT"].to_s[0..8]
+        rev if !rev.empty?
+      end
+
+      def hg_revision
+        return unless File.exist?(".hg")
+        rev = `hg log -l 1 -r . -T '{node}'`.strip
+        rev if !rev.empty?
+      rescue Error::ENOENT # No mercurial installed
+        nil
+      end
+    end
+  end
+end

data/lib/plain_apm/event_attributes.rb

@@ -7,7 +7,6 @@ module PlainApm
       action_controller
       action_mailer
       active_job
-      deploy
       exception
     ].freeze
 
@@ -17,20 +16,6 @@ module PlainApm
       "ActionController::RoutingError" # Rails unmapped route, raised before the request hits the app.
     ].freeze
 
-    def attributes_from_deploy(tool, revision)
-      source = "deploy"
-
-      attrs = {
-        "source" => source,
-        "revision" => revision,
-        "name" => tool
-      }
-
-      attrs.merge!(trace_attributes(source))
-
-      [tool, attrs]
-    end
-
     def attributes_from_exception(e, context, error_source)
       source = "exception"
 
@@ -98,16 +83,20 @@ module PlainApm
       {
         "thread_id" => Thread.current.object_id,
         "collected_at" => Time.now.iso8601(9),
+        # TODO: There is a perf cost in Rubies until 3.3, so it might be a good
+        # idea to cache this. See https://bugs.ruby-lang.org/issues/19443 for
+        # the feature.
+        "pid" => Process.pid,
         "version" => PlainApm::VERSION
       }.merge(
-        host_attributes
+        cached_attributes
       )
     end
 
-    def host_attributes
-      @host_attributes ||= {
+    def cached_attributes
+      @cached_attributes ||= {
         "hostname" => Socket.gethostname,
-        "pid" => Process.pid
+        "revision" => PlainApm::DeployTracking.revision
       }
     end
 

data/lib/plain_apm/hooks/active_record.rb

@@ -22,7 +22,7 @@ module PlainApm
 
         case name
         when "sql"
-          base.merge({"sql" => payload[:sql]})
+          base.merge({"sql" => payload[:sql], "sql_name" => payload[:name]})
         when "instantiation"
           base.merge({"class_name" => payload[:class_name], "record_count" => payload[:record_count]})
         end

data/lib/plain_apm/version.rb

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

data/lib/plain_apm.rb

@@ -4,13 +4,11 @@ require_relative "plain_apm/version"
 require_relative "plain_apm/transport"
 require_relative "plain_apm/config"
 require_relative "plain_apm/agent"
+require_relative "plain_apm/deploy_tracking"
 require_relative "plain_apm/event_attributes"
 
 require "object_tracing"
 
-# Deployment reporting.
-require_relative "plain_apm/hooks/deploy"
-
 # Rails instrumentation. The hooks won't install unless
 # ActiveSupport::Notifications is loaded.
 require_relative "plain_apm/hooks/active_support_subscriber"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - PlainAPM Team
@@ -99,6 +99,7 @@ files:
 - lib/plain_apm.rb
 - lib/plain_apm/agent.rb
 - lib/plain_apm/config.rb
+- lib/plain_apm/deploy_tracking.rb
 - lib/plain_apm/event_attributes.rb
 - lib/plain_apm/extensions/context.rb
 - lib/plain_apm/extensions/context/LICENSE.txt
@@ -119,7 +120,6 @@ files:
 - lib/plain_apm/hooks/active_record.rb
 - lib/plain_apm/hooks/active_support.rb
 - 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

data/lib/plain_apm/hooks/deploy.rb

@@ -1,59 +0,0 @@
-module PlainApm
-  ##
-  # Tracks current revision of the app.
-  #
-  # This enables per-deploy metrics segmentation and checking
-  # for performance regressions.
-  module Hooks
-    class Deploy
-      include EventAttributes
-
-      ##
-      # Collect once, immediately on install.
-      def install
-        collect
-      end
-
-      def uninstall
-        # NOOP
-      end
-
-      def collect
-        result = git_revision || hg_revision || return
-
-        _, attrs = attributes_from_deploy(*result)
-
-        ::PlainApm.agent.collect(attrs)
-      end
-
-      private
-
-      # TODO: other deploy mechanisms
-      #
-      # Also, we might not be in the app root.
-      def git_revision
-        return unless File.exist?(".git")
-
-        rev = `git rev-parse --short=8 HEAD`.strip
-
-        return if rev.empty?
-
-        ["git", rev]
-      rescue Error::ENOENT # No git installed
-        nil
-      end
-
-      def hg_revision
-        return unless File.exist?(".hg")
-
-        rev = `hg log -l 1 -r . -T '{node}'`.strip
-
-        return if rev.empty?
-
-        ["hg", rev]
-      rescue Error::ENOENT # No mercurial installed
-        nil
-      end
-    end
-  end
-end