aws-xray 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ebaad8e050c5b8f917c956164dd5a7769c1c4dee5dd5ddb0d771899f4f2d451
-  data.tar.gz: 3574a9341bae80e8efef838287e6d0e42e8567c794ff5ffbbf45e4a5edbf29dc
+  metadata.gz: 10edc8cd3e2fb395697400fc98d9bf23e19612672fd4052292113d1d114aef5d
+  data.tar.gz: bb02ea13f5125df8ba5d7170efc42c71cccef6b3192a4f10227c1a3053f9718d
 SHA512:
-  metadata.gz: 00fe3dd905a62456ebf301d7954650a9b53a4a8aff850372c2e278431ba6cca0de1ee9f7c822e8626d9da1ab6c8223356c8409ff9c180928893457b2594fcbd7
-  data.tar.gz: 634b7769eaca9aab5f17a0784d2da4e1144f93a88afdea3dd40344ea42cbe17a72c08fa82cc0209ddb67688a54e9667984376e3f46a6b8edf3d9a2b92fd7d89c
+  metadata.gz: def8ffbb94e688612fbf9f123bb0808fcedaa83eb0e00b92ff29ee9cd4ec22e87e909c7f7893aa1690884b73c285defb564c2ca6863a4d63ee0f5775c633bce8
+  data.tar.gz: b7798a486132e087de6cd143639c89d9a004d2a898f886d27b3937f27c4abe13ba8227063c2b7e20b16719e6fbd374376ce1e572602001fd2661650d145da277

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+    name: Run test with Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG
 Only breaking or notable changes.
 
+## v0.39.0
+- `ErrorHandlerWithSentry` now supports `sentry-ruby` gem.
+
 ## v0.38.0
 - aws/xray/hooks/active_record was removed because it's not usable due to too many traces
 

data/README.md

@@ -1,5 +1,5 @@
 # aws-xray
-[![Build Status](https://travis-ci.org/taiki45/aws-xray.svg?branch=master)](https://travis-ci.org/taiki45/aws-xray)
+[![Build Status](https://github.com/cookpad/aws-xray/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cookpad/aws-xray/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/aws-xray.svg)](https://badge.fury.io/rb/aws-xray)
 [![Coverage Status](https://coveralls.io/repos/github/taiki45/aws-xray/badge.svg)](https://coveralls.io/github/taiki45/aws-xray)
 [![Inline docs](http://inch-ci.org/github/taiki45/aws-xray.svg?branch=master)](http://inch-ci.org/github/taiki45/aws-xray)
@@ -11,7 +11,7 @@ AWS X-Ray is a distributed tracing system. See more detail about AWS X-Ray at [o
 If you want to know what is distributed tracing, what is problems behind, etc.., please refer [Google's Dapper paper](https://research.google.com/pubs/pub36356.html).
 
 ## Features
-aws-xray has full feautres to build and send tracing data to AWS X-Ray.
+aws-xray has full features to build and send tracing data to AWS X-Ray.
 
 - Propagation support in both single and multi thread environments.
 - Instrumentation for major libraries.

data/aws-xray.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rsolr'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'sentry-raven'
+  spec.add_development_dependency 'sentry-ruby'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'webmock'

data/lib/aws/xray/error_handlers.rb

@@ -21,12 +21,30 @@ Error: #{error}
       end
     end
 
-    # Must be configured sentry-raven gem.
+    # Must be configured sentry-raven or sentry-ruby gem.
     class ErrorHandlerWithSentry
+      class MissingSentryError < StandardError; end
+
+      def initialize
+        if !defined?(::Sentry) && !defined?(::Raven)
+          raise MissingSentryError.new('Must be installed sentry-raven or sentry-ruby gem')
+        end
+      end
+
       ERROR_LEVEL = 'warning'.freeze
 
       def call(error, payload, host:, port:)
-        ::Raven.capture_exception(
+        if defined?(::Raven)
+          ::Raven.capture_exception(
+            error,
+            level: ERROR_LEVEL,
+            extra: { 'payload' => payload, 'payload_raw' => payload.unpack('H*').first }
+          )
+
+          return
+        end
+
+        ::Sentry.capture_exception(
           error,
           level: ERROR_LEVEL,
           extra: { 'payload' => payload, 'payload_raw' => payload.unpack('H*').first }

data/lib/aws/xray/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-xray
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sentry-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +255,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -310,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The unofficial X-Ray Tracing SDK for Ruby.

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-sudo: false
-branches:
-  only:
-    - master
-rvm:
-  - 2.6
-  - 2.7
-  - 3.0