zipkin-tracer 0.43.1 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2493a14e47c3a0a3b5f1873e37a0d3fdfcc6c8cba395fbb8c894edacec1449c4
-  data.tar.gz: 7f27e5b54765e4374be3cd18181bcb52b7629ac12c2b9c00f56b9a03d67bea5b
+  metadata.gz: 46e54f012c081598681f2f5da8a961f29cb8656b8a21fa1877358724c2fa20b8
+  data.tar.gz: c22b07513bdca3173bdedbf1948d00f09907f669142f4d186c5f66808bb4d959
 SHA512:
-  metadata.gz: f067698e91c87ee24909f7c4f3f47ffa3c081b06e8d6bade1788231835694c4f91d07e3373658427672b20d2e9a7403395bb989a1192b371c3ad1d4e59907c26
-  data.tar.gz: b0f099816909682ec8c6fec3a72426f5beb38ace33a5553b8214eb8778604cd33d9f641db3715548660671f0107c868f2c1f15cc1558fc12b1707f3cdf68fdc5
+  metadata.gz: f5b58005b5f1fe570f50cb36b66b7f72d6e27a620fee2453b3bc7b74e46202ddebb16b5b6d1e71d3a698f236ffebe7cd1ad60de128103f7a40929f12180eca82
+  data.tar.gz: dc910caca3ce2234aa5e12bc2c8363a98a711f717e84e05943a6246f0c462fd614486617cf9a9211721da92abb3d01bee18e1e6a0c66e7220c340395f56f79fd

data/.gitignore

@@ -9,16 +9,20 @@
 /test/version_tmp/
 /tmp/
 
-## Documentation cache and generated files:
+# Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
 /doc/
 /rdoc/
 
-## Environment normalisation:
+# Environment normalisation:
 /.bundle/
 /lib/bundler/man/
 
+# Appraisal related files
+/gemfiles/.bundle/
+/gemfiles/*.gemfile.lock
+
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 # Gemfile.lock

data/.travis.yml

@@ -1,15 +1,22 @@
 language: ruby
 dist: bionic
-jdk:
-  - openjdk11
+jdk: openjdk11
+
 rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
   - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - jruby-9.1
   - jruby-9.2
+
+gemfile:
+  - gemfiles/faraday_0.x.gemfile
+  - gemfiles/faraday_1.x.gemfile
+
+script: bundle exec rspec
+
 deploy:
   provider: rubygems
   api_key:
@@ -18,7 +25,8 @@ deploy:
   on:
     tags: true
     repo: openzipkin/zipkin-ruby
-    condition: "$TRAVIS_RUBY_VERSION == 2.6"
+    condition: "$TRAVIS_RUBY_VERSION == 2.7"
+
 notifications:
   webhooks:
     urls:
@@ -26,4 +34,3 @@ notifications:
       - https://webhooks.gitter.im/e/e57478303f87ecd7bffc
     on_success: change
     on_failure: always
-script: "bundle exec rspec"

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'faraday_0.x' do
+  gem 'faraday', '~> 0.13'
+end
+
+appraise 'faraday_1.x' do
+  gem 'faraday', '~> 1.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.44.0
+* Allow Faraday 1.x.
+
 # 0.43.1
 * Fix to not flush `PRODUCER` span when a server span is in the stack.
 

data/README.md

@@ -43,11 +43,6 @@ use ZipkinTracer::RackHandler, config
 
 ### Sending traces on outgoing requests with Faraday
 
-First, Faraday has to be part of your Gemfile:
-```
-gem 'faraday', '~> 0.8'
-```
-
 For the Faraday middleware to have the correct trace ID, the rack middleware should be used in your application as explained above.
 
 Then include `ZipkinTracer::FaradayHandler` as a Faraday middleware:
@@ -56,10 +51,8 @@ Then include `ZipkinTracer::FaradayHandler` as a Faraday middleware:
 require 'faraday'
 require 'zipkin-tracer'
 
-conn = Faraday.new(:url => 'http://localhost:9292/') do |faraday|
+conn = Faraday.new(url: 'http://localhost:9292/') do |faraday|
   faraday.use ZipkinTracer::FaradayHandler, 'service_name' # 'service_name' is optional (but recommended)
-  # default Faraday stack
-  faraday.request :url_encoded
   faraday.adapter Faraday.default_adapter
 end
 ```

data/gemfiles/faraday_0.x.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.13"
+
+platforms :ruby do
+  gem "benchmark-ips"
+  gem "rbtrace"
+  gem "byebug"
+  gem "simplecov", require: false
+end
+
+platforms :jruby do
+  gem "hermann", "~> 0.27.0"
+end
+
+gemspec path: "../"

data/gemfiles/faraday_1.x.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 1.0"
+
+platforms :ruby do
+  gem "benchmark-ips"
+  gem "rbtrace"
+  gem "byebug"
+  gem "simplecov", require: false
+end
+
+platforms :jruby do
+  gem "hermann", "~> 0.27.0"
+end
+
+gemspec path: "../"

data/lib/zipkin-tracer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ZipkinTracer
-  VERSION = '0.43.1'.freeze
+  VERSION = '0.44.0'
 end

data/zipkin-tracer.gemspec

@@ -24,16 +24,17 @@ Gem::Specification.new do |s|
   end
   s.require_paths = ['lib']
 
-  s.add_dependency 'faraday', '~> 0.13'
+  s.add_dependency 'faraday', '>= 0.13', '< 2.0'
   s.add_dependency 'rack', '>= 1.0'
   s.add_dependency 'sucker_punch', '~> 2.0'
 
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'aws-sdk-sqs', '~> 1.0'
   s.add_development_dependency 'excon', '~> 0.53'
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'rspec-json_expectations', '~> 2.2'
   s.add_development_dependency 'rack-test', '~> 1.1'
-  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'timecop', '~> 0.8'
   s.add_development_dependency 'webmock', '~> 3.0'
   s.add_development_dependency 'simplecov', '~> 0.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.44.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -14,22 +14,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +64,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +220,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -209,6 +230,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/faraday_0.x.gemfile
+- gemfiles/faraday_1.x.gemfile
 - lib/zipkin-tracer.rb
 - lib/zipkin-tracer/application.rb
 - lib/zipkin-tracer/config.rb