scout_apm 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfac08a037b046a0775634ea7ba351a9e3310c3eb4ea3bedd0571bead3984379
-  data.tar.gz: 4218e6a354d14dfc920cf34f86dd556c25e2fe8be04f78d43963ea00ad7ec9a9
+  metadata.gz: 6a0344ecd846204d2b4057246c9719ebf4453a1c240847e54357a75cecda39b6
+  data.tar.gz: 55b8b4c379fee7e5f8275bde73f27fa7d9e1e16b560c70207e51e4225e45184c
 SHA512:
-  metadata.gz: 87aa046c482068c6bd85c14fa9550796099fb6517fd17eeb10888f61d6ccd4ed724e51deb57c6c9598d556f5f7f48a4faed4457d4c2c0e6d4eaf97c66e4004df
-  data.tar.gz: ac15c172111160f119c56cae0bdd6494704b481bb02a22a97cd5d373fafa3e5d747039c412b3bc50cf0e1f293b0c32542fbbd8a2547cdbbaf918898f5c382901
+  metadata.gz: 45cd0a3dc5b6632a980a38324e6c933d2552eb33aa32e1e9e9da74e5a6b848b5bdb694c27f017502c6a437dd6576486d8186ccbea8ae3c5563b8778bac158870
+  data.tar.gz: d20753a142c71ef03a47608bcae15acdb2aeec11e5f7f75c78ece78657ac828b077af15c152b4e1aac92eb81f98e6a7b211db1aa35349cd8746a37ae76089b25

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 2.6.3
+
+* Standardize Metadata with other language agents (#302)
+* Add Mongoid 7.x support (#295)
+* Add HTTP::Client support (#260)
+
 # 2.6.2
 
 * Fix Autoinstruments logging when running without ActiveSupport (#290)

data/lib/scout_apm/app_server_load.rb

@@ -29,12 +29,17 @@ module ScoutApm
     end
 
     def data
-      { :server_time        => to_s_safe(Time.now),
+      { 
+        :language           => 'ruby',
+        :language_version   => RUBY_VERSION,
+        :ruby_version       => RUBY_VERSION, # Deprecated.
+
         :framework          => to_s_safe(environment.framework_integration.human_name),
         :framework_version  => to_s_safe(environment.framework_integration.version),
+
+        :server_time        => to_s_safe(Time.now),
         :environment        => to_s_safe(environment.framework_integration.env),
         :app_server         => to_s_safe(environment.app_server),
-        :ruby_version       => RUBY_VERSION,
         :hostname           => to_s_safe(environment.hostname),
         :database_engine    => to_s_safe(environment.database_engine),      # Detected
         :database_adapter   => to_s_safe(environment.raw_database_adapter), # Raw

data/lib/scout_apm/instruments/http.rb

@@ -0,0 +1,48 @@
+module ScoutApm
+  module Instruments
+    class HTTP
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
+        @installed = false
+      end
+
+      def logger
+        context.logger
+      end
+
+      def installed?
+        @installed
+      end
+
+      def install
+        if defined?(::HTTP) && defined?(::HTTP::Client)
+          @installed = true
+
+          logger.info "Instrumenting HTTP::Client"
+
+          ::HTTP::Client.class_eval do
+            include ScoutApm::Tracer
+
+            def request_with_scout_instruments(verb, uri, opts = {})
+              self.class.instrument("HTTP", verb, :ignore_children => true, :desc => request_scout_description(verb, uri)) do
+                request_without_scout_instruments(verb, uri, opts)
+              end
+            end
+
+            def request_scout_description(verb, uri)
+              max_length = ScoutApm::Agent.instance.context.config.value('instrument_http_url_length')
+              (String(uri).split('?').first)[0..(max_length - 1)]
+            rescue
+              ""
+            end
+
+            alias request_without_scout_instruments request
+            alias request request_with_scout_instruments
+          end
+        end
+      end
+    end
+  end
+end

data/lib/scout_apm/instruments/mongoid.rb

@@ -37,8 +37,8 @@ module ScoutApm
           ### See moped instrument for Moped driven deploys
 
           ### 5.x Mongoid
-          if (mongoid_v5? || mongoid_v6?) && defined?(::Mongoid::Contextual::Mongo)
-            logger.info "Instrumenting Mongoid 5.x/6.x"
+          if (mongoid_v5? || mongoid_v6? || mongoid_v7?) && defined?(::Mongoid::Contextual::Mongo)
+            logger.info "Instrumenting Mongoid 5.x/6.x/7.x"
             # All the public methods from Mongoid::Contextual::Mongo.
             # TODO: Geo and MapReduce support (?). They are in other Contextual::* classes
             methods = [
@@ -54,8 +54,6 @@ module ScoutApm
               if ::Mongoid::Contextual::Mongo.method_defined?(method)
                 with_scout_instruments = %Q[
                 def #{method}_with_scout_instruments(*args, &block)
-
-
                   req = ScoutApm::RequestManager.lookup
                   *db, collection = view.collection.namespace.split(".")
 
@@ -112,6 +110,13 @@ module ScoutApm
         end
       end
 
+      def mongoid_v7?
+        if defined?(::Mongoid::VERSION)
+          ::Mongoid::VERSION =~ /\A7/
+        else
+          false
+        end
+      end
 
       # Example of what a filter looks like: => {"founded"=>{"$gte"=>"1980-1-1"}, "name"=>{"$in"=>["Tool", "Deftones", "Melvins"]}}
       # Approach: find every leaf-node, clear it. inspect the whole thing when done.

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -287,6 +287,7 @@ files:
 - lib/scout_apm/instruments/active_record.rb
 - lib/scout_apm/instruments/elasticsearch.rb
 - lib/scout_apm/instruments/grape.rb
+- lib/scout_apm/instruments/http.rb
 - lib/scout_apm/instruments/http_client.rb
 - lib/scout_apm/instruments/influxdb.rb
 - lib/scout_apm/instruments/memcached.rb