aws-xray 0.37.2 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36fd97ace078801e2a508c9015101cd4af6e8bf57e9560d3a08428fc264a03d
-  data.tar.gz: b2dfcd39e4b0354d81a964390bfe46f3ec86235662c4999d306847963dc9dbde
+  metadata.gz: 6ebaad8e050c5b8f917c956164dd5a7769c1c4dee5dd5ddb0d771899f4f2d451
+  data.tar.gz: 3574a9341bae80e8efef838287e6d0e42e8567c794ff5ffbbf45e4a5edbf29dc
 SHA512:
-  metadata.gz: 3643b6f45ab12c7d856000cc2304ce318628ac88706d0fb3db4dcb1027797800a5bea61e5b59d23a5f8f4d90195a31d04ac1104cceb76862ee10f35cc483eeae
-  data.tar.gz: 6639268cc73905177b287ca208968b32434301c9b8eef4185e59b17a92bcb6ca28ed646b972967628ae6db0110ca929da424e527b4cc9052c5473d03d2c1fc10
+  metadata.gz: 00fe3dd905a62456ebf301d7954650a9b53a4a8aff850372c2e278431ba6cca0de1ee9f7c822e8626d9da1ab6c8223356c8409ff9c180928893457b2594fcbd7
+  data.tar.gz: 634b7769eaca9aab5f17a0784d2da4e1144f93a88afdea3dd40344ea42cbe17a72c08fa82cc0209ddb67688a54e9667984376e3f46a6b8edf3d9a2b92fd7d89c

data/.travis.yml

@@ -4,6 +4,6 @@ branches:
   only:
     - master
 rvm:
-  - 2.4
-  - 2.5
   - 2.6
+  - 2.7
+  - 3.0

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG
 Only breaking or notable changes.
 
+## v0.38.0
+- aws/xray/hooks/active_record was removed because it's not usable due to too many traces
+
 ## v0.34.0
 - Change default sampling rate from 0.1% to undefined. Please set proper sampling rate in your production system.
 

data/README.md

@@ -23,7 +23,6 @@ aws-xray has full feautres to build and send tracing data to AWS X-Ray.
 - net/http
 - rack
 - faraday
-- activerecord
 - rsolr
 
 ## Getting started
@@ -196,8 +195,6 @@ You can enable all the hooks with:
 gem 'aws-xray', require: 'aws/xray/hooks/all'
 ```
 
-NOTE: activerecord hook won't be enabled by this because the hook may produce lots of trace records.
-
 #### net/http hook
 To monkey patch net/http and records out-going http requests automatically, just require `aws/xray/hooks/net_http`:
 
@@ -219,11 +216,6 @@ response = Aws::Xray.overwrite(name: 'sns') do
 end
 ```
 
-#### activerecord hook
-`require 'aws/xray/hooks/active_record'`.
-
-Note this hook can record large amount of data.
-
 #### rsolr hook
 When you want to name solr requests, use this hook by require `aws/xray/hooks/rsolr`. The typical usecase is you use local haproxy to proxy to solr instances and you want to distinguish these requests from other reqeusts using local haproxy.
 

data/aws-xray.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack'
-  spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'faraday'
+  spec.add_development_dependency 'irb'
   spec.add_development_dependency 'json-schema'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rack-test'

data/lib/aws/xray/hooks/all.rb

@@ -1,4 +1,3 @@
-# Don't require activerecord hook because the hook may produce lots of trace records.
 require 'aws/xray'
 require 'aws/xray/hooks/net_http'
 require 'aws/xray/hooks/rsolr'

data/lib/aws/xray/sockets.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Aws
   module Xray
     # For test

data/lib/aws/xray/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module Xray
-    VERSION = '0.37.2'.freeze
+    VERSION = '0.38.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.38.0
 platform: ruby
 authors:
 - Taiki Ono
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,7 +276,6 @@ files:
 - lib/aws/xray/errors.rb
 - lib/aws/xray/faraday.rb
 - lib/aws/xray/header_parser.rb
-- lib/aws/xray/hooks/active_record.rb
 - lib/aws/xray/hooks/all.rb
 - lib/aws/xray/hooks/net_http.rb
 - lib/aws/xray/hooks/rsolr.rb
@@ -296,7 +295,7 @@ homepage: https://github.com/taiki45/aws-xray
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,8 +310,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.13
+signing_key:
 specification_version: 4
 summary: The unofficial X-Ray Tracing SDK for Ruby.
 test_files: []

data/lib/aws/xray/hooks/active_record.rb

@@ -1,86 +0,0 @@
-require 'aws/xray'
-require 'active_record'
-
-module Aws
-  module Xray
-    module Hooks
-      module ActiveRecord
-        extend self
-
-        IGNORE_NAMES = ['SCHEMA', 'ActiveRecord::SchemaMigration Load']
-
-        # event has #name, #time, #end, #duration, #payload
-        # payload has #sql, #name, #connection_id, #binds, #cached
-        #
-        # @param [ActiveSupport::Notifications::Event] e
-        def record(e)
-          return if IGNORE_NAMES.include?(e.payload[:name])
-
-          if !e.payload[:cached] && Aws::Xray::Context.started?
-            pool, con = fetch_connection_and_pool(e.payload[:connection_id])
-            return if pool.nil? || con.nil?
-            name = build_name(pool.spec)
-            return unless name # skip when connected to default host (typycally localhost)
-
-            Aws::Xray::Context.current.start_subsegment(name: name, remote: true) do |sub|
-              sub.start(e.time)
-              sub.finish(e.end)
-              sub.set_sql(Aws::Xray::Sql.build(
-                url: build_url(pool.spec),
-                database_version: build_version(con),
-              ))
-            end
-          end
-        end
-
-        private
-
-        def fetch_connection_and_pool(id)
-          pool, con = nil, nil
-          ::ActiveRecord::Base.connection_handler.connection_pool_list.each do |p|
-            p.connections.each do |c|
-              if c.object_id == id
-                pool, con = p, c
-              end
-            end
-          end
-          return pool, con
-        end
-
-        def build_name(spec)
-          spec.config.with_indifferent_access[:host]
-        end
-
-        def build_url(spec)
-          config = spec.config.with_indifferent_access
-          adapter = config.delete(:adapter) || 'unknown'
-          host = config.delete(:host) || 'localhost'
-          port = config.delete(:port) || ''
-          username = config.delete(:username) || ''
-          database = config.delete(:database) || ''
-          config.delete(:password)
-          query = config.map {|k, v| "#{k}=#{v}" }.join('&')
-          query_str = query.empty? ? '' : "?#{query}"
-          "#{adapter}://#{username}@#{host}:#{port}/#{database}#{query_str}"
-        end
-
-        def build_version(con)
-          if con.respond_to?(:version)
-            if (v = con.version.instance_variable_get('@version'))
-              v.join('.')
-            else
-              nil
-            end
-          else
-            nil
-          end
-        end
-      end
-    end
-  end
-end
-
-# maybe old version?
-ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-  Aws::Xray::Hooks::ActiveRecord.record(ActiveSupport::Notifications::Event.new(*args))
-end