plain_apm 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4d2bddabd031b2b17d2edcf27e32f323c217b2331c469072e95d0afeb58ec7
-  data.tar.gz: a892bbd62da4a10b074046c39326576355d591bf02982f9d336a97d887f99bc6
+  metadata.gz: 41e2fd7c72868351a09c83a13a22df9e9718e00cbb1950c27e7ce129cf24a826
+  data.tar.gz: 2f658463e3ee8f8195142a2b456b6f5c535efac868ada116f766ef92db5ab714
 SHA512:
-  metadata.gz: b523dbaea426bbb9f2e4c2808efb4937ebf5c842361d07c9a0ae6a23bef03fe8bef0a71815710b4c55a7f8a1eeaea01e8b0fbe01bb3ed9af58743a31aa09c0aa
-  data.tar.gz: 93c110b5e728cd6e934cbb25e56bd5345e3cc45dc1776922ca39a5de902e19a996fcc2aa7de0c749b231e8faf137b16be49f1d9389bec1735986223f18bc6798
+  metadata.gz: 139c55ba03f6982640310ba59122fab53c6fb9c871e409c304b5d5ebd50e44c34af8db691195acb4dd7b4b43087092e7b9f1fe052f8d7aa299b863d4b4301c8e
+  data.tar.gz: da0cd391b91b3660ef48fc8587e26562d1caf908526b2af86e9c42e2cff945940c779b6b115763bacf8f105e33e7422e4a27d403c788b8d44be9d33d909e1460

data/lib/plain_apm/event_attributes.rb

@@ -1,6 +1,6 @@
 module PlainApm
   module EventAttributes
-    SOURCES_WITH_HOST_ATTRIBUTES = %w[
+    SOURCES_WITH_EXTRA_ATTRIBUTES = %w[
       action_controller
       action_mailer
       active_job
@@ -23,8 +23,7 @@ module PlainApm
         "name" => tool
       }
 
-      attrs.merge!(agent_attributes)
-      attrs.merge!(host_attributes) if add_host_attributes?(source)
+      attrs.merge!(trace_attributes(source))
 
       [tool, attrs]
     end
@@ -41,7 +40,7 @@ module PlainApm
       }
 
       if context[:env]
-        attrs["params"] = env["action_dispatch.request.parameters"]
+        attrs["params"] = context[:env]["action_dispatch.request.parameters"]
       end
 
       if context[:job]&.is_a?(ActiveJob::Base)
@@ -57,8 +56,7 @@ module PlainApm
         })
       end
 
-      attrs.merge!(context_attributes, agent_attributes)
-      attrs.merge!(host_attributes) if add_host_attributes?(source)
+      attrs.merge!(trace_attributes(source))
 
       [source, attrs]
     end
@@ -72,30 +70,33 @@ module PlainApm
         "name" => name,
         "allocations" => event.allocations,
         "thread_allocations" => event.thread_allocations,
-        "started_at" => event.time,
-        "finished_at" => event.end
+        "event_time" => event.time,
+        "duration" => event.duration
       }
 
       attrs["source_location"] = loc if !loc.nil?
-      attrs.merge!(context_attributes, agent_attributes)
-      attrs.merge!(host_attributes) if add_host_attributes?(source)
+
+      attrs.merge!(trace_attributes(source))
 
       [name, attrs]
     end
 
     private
 
-    def context_attributes
-      ##
-      # Context contains the trace ID (which comes from either
-      # HTTP_X_REQUEST_ID header, the deserialized job,
-      # or is generated by the trace_id middleware).
-      # It can also carry user inserted app data.
-      if defined?(PlainApm::Extensions::Context)
-        PlainApm::Extensions::Context.current
+    def trace_attributes(source)
+      attrs = agent_attributes
+
+      if add_extra_attributes?(source)
+        attrs.merge!(process_attributes, context_attributes)
       else
-        {}
+        attrs.merge!(context_attributes.slice(:trace_id))
       end
+
+      attrs
+    end
+
+    def add_extra_attributes?(source)
+      SOURCES_WITH_EXTRA_ATTRIBUTES.include?(source)
     end
 
     def agent_attributes
@@ -104,7 +105,7 @@ module PlainApm
       }
     end
 
-    def host_attributes
+    def process_attributes
       {
         "collected_at" => Time.now.iso8601(9),
         "hostname" => Socket.gethostname,
@@ -113,8 +114,17 @@ module PlainApm
       }
     end
 
-    def add_host_attributes?(source)
-      SOURCES_WITH_HOST_ATTRIBUTES.include?(source)
+    def context_attributes
+      ##
+      # Context contains the trace ID (which comes from either
+      # HTTP_X_REQUEST_ID header, the deserialized job,
+      # or is generated by the trace_id middleware).
+      # It can also carry user inserted app data.
+      if defined?(PlainApm::Extensions::Context)
+        PlainApm::Extensions::Context.current
+      else
+        {}
+      end
     end
 
     def source_location

data/lib/plain_apm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - PlainAPM Team