aws-xray 0.35.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de94539e68d8048e57af8669d4e448c4b19caf1b
-  data.tar.gz: 30d076056f6d338963ff33ed62e3f26a9c0e949a
+SHA256:
+  metadata.gz: 6ebaad8e050c5b8f917c956164dd5a7769c1c4dee5dd5ddb0d771899f4f2d451
+  data.tar.gz: 3574a9341bae80e8efef838287e6d0e42e8567c794ff5ffbbf45e4a5edbf29dc
 SHA512:
-  metadata.gz: 9d3fc5b75c99b1968bcffb8421d5d70da6c78e15ae930a1f876df3a91f1b65af59f32397404e880cc7c6efe51b8376136af803356f2612347872438711c5b355
-  data.tar.gz: 830f48dc665ea1b49e3406317c3a8ac7278a21e5c978a83b7978f514f3431669b5fd53a413c018a5dc087e29a84d88d630c7a738b6c8cc2f08e21800044c64f7
+  metadata.gz: 00fe3dd905a62456ebf301d7954650a9b53a4a8aff850372c2e278431ba6cca0de1ee9f7c822e8626d9da1ab6c8223356c8409ff9c180928893457b2594fcbd7
+  data.tar.gz: 634b7769eaca9aab5f17a0784d2da4e1144f93a88afdea3dd40344ea42cbe17a72c08fa82cc0209ddb67688a54e9667984376e3f46a6b8edf3d9a2b92fd7d89c

data/.travis.yml

@@ -4,6 +4,6 @@ branches:
   only:
     - master
 rvm:
-  - 2.2.7
-  - 2.3
-  - 2.4
+  - 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
@@ -127,7 +126,7 @@ Aws::Xray.config.segment_sending_error_handler = Aws::Xray::ErrorHandlerWithSent
 ```
 
 ### Recording caller of HTTP requests
-Set `Aws::Xray.config.record_caller_of_http_requests = true` if you want investigate the caller of specific HTTP requests.
+Set `Aws::Xray.config.record_caller_of_http_requests = true` if you want to investigate the caller of specific HTTP requests.
 It records caller of net/http and Faraday middleware.
 
 ## Usage
@@ -217,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/bump

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+level = ARGV.first
+if level.nil?
+  warn "Example: #{__FILE__} (tiny|minor|major)"
+  exit 1
+end
+
+path = 'lib/aws/xray/version.rb'
+regexp = /VERSION = '(.+)'.freeze$/
+version = File.read(path).scan(regexp)[0][0]
+version_strs = version.split('.')
+
+if version_strs.size > 3
+  warn "Current version includes a prelease suffix, drop it: #{version}"
+  version_strs = version_strs[0..2]
+end
+
+case level
+when 'tiny'
+  version_strs[2] = version_strs[2].to_i + 1
+when 'minor'
+  version_strs[1] = version_strs[1].to_i + 1
+  version_strs[2] = 0
+when 'major'
+  version_strs[0] = version_strs[0].to_i + 1
+  version_strs[1] = 0
+  version_strs[2] = 0
+else
+  warn "Example: #{__FILE__} (tiny|minor|major)"
+  exit 1
+end
+
+next_version = version_strs.join('.')
+File.write(path, File.read(path).gsub(regexp, "VERSION = '#{next_version}'.freeze"))
+system('git', 'add', path)
+system('git', 'commit', '-m', "v#{next_version}")

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

@@ -1,4 +1,3 @@
 require 'aws/xray'
-require 'aws/xray/hooks/active_record'
 require 'aws/xray/hooks/net_http'
 require 'aws/xray/hooks/rsolr'

data/lib/aws/xray/rack.rb

@@ -25,6 +25,7 @@ module Aws
         trace = build_trace(env[TRACE_ENV])
         env[ORIGINAL_TRACE_ENV] = env[TRACE_ENV] if env[TRACE_ENV] # just for the record
         env[TRACE_ENV] = trace.to_header_value
+        record_context!(trace)
 
         Aws::Xray.trace(name: @name, trace: trace) do |seg|
           seg.set_http_request(Request.build_from_rack_env(env))
@@ -47,6 +48,13 @@ module Aws
       def excluded_path?(path)
         !!@excluded_paths.find {|p| p === path }
       end
+
+      def record_context!(trace)
+        ::Raven.tags_context(xray_sampled: trace.sampled? ? '1' : '0') if defined?(::Raven)
+      rescue => e
+        Aws::Xray.config.logger.error("#{e.message}\n#{e.backtrace.join("\n")}")
+        # Ignore the error
+      end
     end
   end
 end

data/lib/aws/xray/rails.rb

@@ -5,7 +5,13 @@ module Aws
     class Railtie < ::Rails::Railtie
       initializer 'aws-xray.set_name' do |app|
         unless Aws::Xray.config.name
-          app_name = app.class.parent_name.underscore.gsub(/(\/|_)/, '-')
+          klass = app.class
+          parent_name = if klass.respond_to?(:module_parent_name)
+              klass.module_parent_name
+            else
+              klass.parent_name
+            end
+          app_name = parent_name.underscore.gsub(/(\/|_)/, '-')
 
           if Rails.env.production?
             Aws::Xray.config.name = app_name

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.35.0'
+    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.35.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Taiki Ono
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-10-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:
     - - ">="
@@ -254,6 +254,7 @@ files:
 - aws-xray.gemspec
 - bin/console
 - bin/setup
+- bump
 - example/Gemfile
 - example/Procfile
 - example/README.md
@@ -275,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
@@ -291,12 +291,11 @@ files:
 - lib/aws/xray/version.rb
 - lib/aws/xray/version_detector.rb
 - lib/aws/xray/worker.rb
-- prepare_release.rb
 homepage: https://github.com/taiki45/aws-xray
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,9 +310,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-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

data/prepare_release.rb

@@ -1,11 +0,0 @@
-after = ARGV.first
-if after.nil?
-  $stderr.puts "Example: ruby #{__FILE__} v0.6.0"
-  exit 1
-end
-
-path = 'lib/aws/xray/version.rb'
-version_str = after.gsub('v', '')
-File.write(path, File.read(path).gsub(/VERSION = '.+'$/, "VERSION = '#{version_str}'"))
-system('git', 'add', path)
-system('git', 'commit', '-m', after)