zipkin-tracer 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82721c4960c43ae115304bb20f3cd2bc449118ad9e4a7bab46f83a99faec0d97
-  data.tar.gz: 3ab36bb2a93a25222be0ca3e3a2515c8e25ac76f5cc5d90bde304b76be0d27df
+  metadata.gz: 37efbe4cb404d2d34f93fcc3b5aaa86e962579aeff0f83c9a2326e10f6057eb3
+  data.tar.gz: 2ee5fd81a8e614797a08fa74ced37269d7e8d492ae90690812cf78510538bdf5
 SHA512:
-  metadata.gz: 03240e5d579ed704b2019c73249a3aaa76b608328b00cbb6b24bbcf9b0e870069b2ef05b41e3bed6af4fdbb4460b0d3a0cce5e91c1fdd1c31a15b9a1f851e14c
-  data.tar.gz: 876c7dd29c0c7adfad87d2207b409acd2a4aa0970ebd15fbe9f0b4820124a6a04038d89c48305896ffb8fa146c6c3957011b44aff44be28467bab4aaaf0ce1e3
+  metadata.gz: de1d349955b7e5999488015abc21480a0327c4e956e3d6aa5bcbb92c2769a36af2f51a9e731aa33406c739f688f520bd32f1efe4438bf9ba39160e9d5301c544
+  data.tar.gz: 875f8c728dd41123c2fbaaa2d039863d88ace63a00bedbf91b156ae41740e761a5347e853fa86614db992892c504cda0e2d29b1fd88cf1fd881fef07d637502c

data/.github/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contributing to Zipkin
+
+If you would like to contribute code, fork this GitHub repository and
+send a pull request (on a branch other than `master` or `gh-pages`).
+
+## License
+
+By contributing your code, you agree to license your contribution under
+the terms of the [APLv2](../LICENSE).
+
+All files are copyright "The OpenZipkin Authors" and released with the Apache 2.0 license.

data/.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,15 @@
+---
+name: Bug
+about: If you’ve found a bug, spend the time to write a failing test. Bugs with tests get fixed and stay fixed. If you have a solution in mind, skip raising an issue and open a pull request instead.
+labels: bug
+---
+## Describe the Bug
+A clear and concise description of what the bug is. If you have a solution in mind, skip raising an issue and open a pull request instead.
+
+Regardless, the best is to spend some time to write a failing test. Bugs with tests get fixed and stay fixed.
+
+## Steps to Reproduce
+Steps to reproduce the behavior:
+
+## Expected Behaviour
+Suggest what you think correct behaviour should be. Note, it may be solved differently depending on the problem.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url: https://gitter.im/openzipkin/zipkin
+    about: Please ask questions about how to do something or to understand why something isn't working on our Gitter chat - we'll be happy to respond there in detail. This issue tracker is not for questions.

data/.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Please first, look at existing issues to see if the feature has been requested before.
+labels: enhancement
+---
+Please first, look at [existing issues](https://github.com/openzipkin/zipkin-ruby/issues) to see if the feature has been requested before. If you don't find anything tell us what problem you’re trying to solve. Often a solution already exists! Don’t send pull requests to implement new features without first getting our support. Sometimes we leave features out on purpose to keep the project small.
+
+## Feature
+Description of the feature
+
+## Rationale
+Why would this feature help others besides me?
+
+## Example Scenario
+What kind of use cases would benefit from this feature?
+
+## Prior Art
+* Links to prior art
+* More links

data/.github/workflows/deploy.yml

@@ -0,0 +1,34 @@
+# yamllint --format github .github/workflows/deploy.yml
+---
+name: deploy
+
+# We deploy on a release versions, regardless of if the commit is documentation-only or not.
+#
+# See https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+on:
+  push:
+    tags: '[0-9]+.[0-9]+.[0-9]+**'  # Ex. 1.2.3
+
+jobs:
+  deploy:
+    runs-on: ubuntu-20.04  # newest available distribution, aka focal
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1  # full history is not needed
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - name: Deploy
+        env:
+          # RUBYGEMS_API_KEY=<hex token value>
+          #   - needs to own the gem
+          #   - generated at https://rubygems.org/settings/edit
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          BUNDLE_GEMFILE: gemfiles/faraday_1.x.gemfile
+        run: |  # GITHUB_REF will be refs/tags/MAJOR.MINOR.PATCH
+          build-bin/configure_deploy &&
+          build-bin/deploy $(echo ${GITHUB_REF} | cut -d/ -f 3)

data/.github/workflows/test.yml

@@ -0,0 +1,52 @@
+# yamllint --format github .github/workflows/test.yml
+---
+name: test
+
+# We don't test documentation-only commits.
+on:
+  # We run tests on non-tagged pushes to master
+  push:
+    tags: ''
+    branches: master
+    paths-ignore: '**/*.md'
+  # We also run tests on pull requests targeted at the master branch.
+  pull_request:
+    branches: master
+    paths-ignore: '**/*.md'
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04  # newest available distribution, aka focal
+    strategy:
+      fail-fast: false
+      matrix:  # https://github.com/ruby/setup-ruby/blob/master/README.md#supported-versions
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, jruby-9.1, jruby-9.2]
+        gemfile:
+          - gemfiles/faraday_0.x.gemfile
+          - gemfiles/faraday_1.x.gemfile
+          - gemfiles/faraday_2.x.gemfile
+        exclude:
+          - ruby: 2.3
+            gemfile: gemfiles/faraday_2.x.gemfile
+          - ruby: 2.4
+            gemfile: gemfiles/faraday_2.x.gemfile
+          - ruby: 2.5
+            gemfile: gemfiles/faraday_2.x.gemfile
+          - ruby: jruby-9.1
+            gemfile: gemfiles/faraday_2.x.gemfile
+          - ruby: jruby-9.2
+            gemfile: gemfiles/faraday_2.x.gemfile
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1  # full history is not needed
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: build-bin/configure_test && build-bin/test
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.gitignore

@@ -33,3 +33,7 @@
 Gemfile.lock
 
 .byebug_history
+
+# IntelliJ
+.idea
+*.iml

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise 'faraday_1.x' do
   gem 'faraday', '~> 1.0'
 end
+
+appraise 'faraday_2.x' do
+  gem 'faraday', '~> 2.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.48.0
+* Allow Faraday 2.x.
+
+# 0.47.3
+* Moved CI to [GitHub Actions](https://github.com/openzipkin/zipkin-ruby/workflows).
+
+# 0.47.2
+* Fix to not flush local component span when a server span or a consumer span is in the stack.
+
+# 0.47.1
+* Fix to set `SERVER` span kind at the beginning to avoid being flushed before closing.
+
 # 0.47.0
 * Add a `check_routes` option to make the routable request check optional.
 

data/README.md

@@ -1,6 +1,8 @@
 # ZipkinTracer: Zipkin client for Ruby
 
-[![Build Status](https://api.travis-ci.org/openzipkin/zipkin-ruby.svg?branch=master)](https://travis-ci.org/openzipkin/zipkin-ruby)
+[![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/openzipkin/zipkin)
+[![Build Status](https://github.com/openzipkin/zipkin-ruby/workflows/test/badge.svg)](https://github.com/openzipkin/zipkin-ruby/actions?query=workflow%3Atest)
+[![Gem Version](https://badge.fury.io/rb/zipkin-tracer.svg)](https://badge.fury.io/rb/zipkin-tracer)
 
 Rack and Faraday integration middlewares for Zipkin tracing.
 

data/RELEASE.md

@@ -1,6 +1,44 @@
-## Release Process
+# OpenZipkin Release Process
 
-* tag the commit `git tag -v0.0.0`
-* push tags to origin `git push origin --tags`
-* Travis will automatically build and push to rubygems
-* TODO: have travis push the tag using info from version.rb
+This repo uses semantic versions. Please keep this in mind when choosing version numbers.
+
+1. **Alert others you are releasing**
+
+   There should be no commits made to master while the release is in progress (about 10 minutes). Before you start
+   a release, alert others on [gitter](https://gitter.im/openzipkin/zipkin) so that they don't accidentally merge
+   anything. If they do, and the build fails because of that, you'll have to recreate the release tag described below.
+
+1. **Push a git tag**
+
+   The tag should formatted `MAJOR.MINOR.PATCH`, ex `git tag 1.18.1 && git push origin 1.18.1`.
+
+1. **Wait for CI**
+
+   The `MAJOR.MINOR.PATCH` tag triggers [`build-bin/deploy`](build-bin/deploy), which does the following:
+     * https://rubygems.org/gems/zipkin-tracer [`build-bin/gem/gem_push`](build-bin/gem/gem_push)
+
+## Credentials
+
+The release process uses various credentials. If you notice something failing due to unauthorized,
+look at the notes in [.github/workflows/deploy.yml] and check the [org secrets](https://github.com/organizations/openzipkin/settings/secrets/actions).
+
+## Manually releasing
+
+If for some reason, you lost access to CI or otherwise cannot get automation to work, bear in mind
+this is a normal ruby project, and can be released accordingly.
+
+```bash
+# First, set variable according to your personal credentials. These would normally be assigned as
+# org secrets: https://github.com/organizations/openzipkin/settings/secrets/actions
+export RUBYGEMS_API_KEY=your_api_key
+release_version=xx-version-to-release-xx
+
+# now from latest master, create the MAJOR.MINOR.PATCH tag
+git tag ${release_version}
+
+# Run the deploy using the version you added as a tag
+./build-bin/deploy ${release_version}
+
+# Finally, push the tag
+git push origin ${release_version}
+```

data/build-bin/README.md

@@ -0,0 +1,218 @@
+# Test and Deploy scripts
+
+This is a Ruby project, which uses standard conventions for test and deploy.
+
+Test is normal, except there's a matrix in [CI setup](../.github/workflows/test.yml).
+
+To create a release, push a MAJOR.MINOR.PATCH tag (ex `0.47.2`). Below are details about the deployment process.
+
+Notably, the [gem version](../lib/zipkin-tracer/version.rb) is lazy set, defaulting to `0.0.0`. When
+a release MAJOR.MINOR.PATCH tag (ex `0.47.2`) is pushed, this file is overwritten as a side effect of running
+[deploy]. The release version is not written into git history except as a part of [../CHANGELOG.md]. 
+
+[//]: # (Below here should be standard for all projects)
+
+## Build Overview
+`build-bin` holds portable scripts used in CI to test and deploy the project.
+
+The scripts here are portable. They do not include any CI provider-specific logic or ENV variables.
+This helps `.travis.yml` and `test.yml` (GitHub Actions) contain nearly the same contents, even if
+certain OpenZipkin projects need slight adjustments here. Portability has proven necessary, as
+OpenZipkin has had to transition CI providers many times due to feature and quota constraints.
+
+These scripts serve a second purpose, which is to facilitate manual releases, which has also
+happened many times due usually to service outages of CI providers. While tempting to use
+CI-provider specific tools, doing so can easily create a dependency where no one knows how to
+release anymore. Do not use provider-specific mechanisms to implement release flow. Instead,
+automate triggering of the scripts here.
+
+The only scripts that should be modified per project are in the base directory. Those in sub
+directories, such as [docker], should not vary project to project except accident of version drift.
+Intentional changes in sub directories should be relevant and tested on multiple projects to ensure
+they can be blindly copy/pasted.
+
+Conversely, the files in the base directory are project specific entry-points for test and deploy
+actions and are entirely appropriate to vary per project. Here's an overview:
+
+## Test
+
+Test builds and runs any tests of the project, including integration tests. CI providers should be
+configured to run tests on pull requests or pushes to the master branch, notably when the tag is
+blank. Tests should not run on documentation-only commits. Tests must not depend on authenticated
+resources, as running tests can leak credentials. Git checkouts should include the full history so
+that license headers or other git analysis can take place.
+
+ * [configure_test] - Sets up build environment for tests.
+ * [test] - Builds and runs tests for this project.
+
+### Example GitHub Actions setup
+
+A simplest GitHub Actions `test.yml` runs tests after configuring them, but only on relevant event
+conditions. The name `test.yml` and job `test` allows easy references to status badges and parity of
+the scripts it uses.
+
+The `on:` section obviates job creation and resource usage for irrelevant events. Notably, GitHub
+Actions includes the ability to skip documentation-only jobs.
+
+Combine [configure_test] and [test] into the same `run:` when `configure_test` primes file system
+cache.
+
+Here's a partial `test.yml` including only the aspects mentioned above.
+```yaml
+on:
+  push:
+    tags: ''
+    branches: master
+    paths-ignore: '**/*.md'
+  pull_request:
+    branches: master
+    paths-ignore: '**/*.md'
+
+jobs:
+  test:
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # full git history
+      - name: Test
+        run: build-bin/configure_test && build-bin/test
+```
+
+### Example Travis setup
+`.travis.yml` is a monolithic configuration file broken into stages, of which the default is "test".
+A simplest Travis `test` job configures tests in `install` and runs them as `script`, but only on
+relevant event conditions.
+
+The `if:` section obviates job creation and resource usage for irrelevant events. Travis does not
+support file conditions. A `before_install` step to skip documentation-only commits will likely
+complete in less than a minute (10 credit cost).
+
+Here's a partial `.travis.yml` including only the aspects mentioned above.
+```yaml
+git:
+  depth: false  # TRAVIS_COMMIT_RANGE requires full commit history.
+
+jobs:
+  include:
+    - stage: test
+      if: branch = master AND tag IS blank AND type IN (push, pull_request)
+      name: Run unit and integration tests
+      before_install: |  # Prevent test build of a documentation-only change.
+        if [ -n "${TRAVIS_COMMIT_RANGE}" ] && ! git diff --name-only "${TRAVIS_COMMIT_RANGE}" -- | grep -qv '\.md$'; then
+          echo "Stopping job as changes only affect documentation (ex. README.md)"
+          travis_terminate 0
+        fi
+      install: ./build-bin/configure_test
+      script: ./build-bin/test
+```
+
+When Travis only runs tests (something else does deploy), there's no need to use stages:
+```yaml
+git:
+  depth: false  # TRAVIS_COMMIT_RANGE requires full commit history.
+
+if: branch = master AND tag IS blank AND type IN (push, pull_request)
+before_install: |  # Prevent test build of a documentation-only change.
+  if [ -n "${TRAVIS_COMMIT_RANGE}" ] && ! git diff --name-only "${TRAVIS_COMMIT_RANGE}" -- | grep -qv '\.md$'; then
+    echo "Stopping job as changes only affect documentation (ex. README.md)"
+    travis_terminate 0
+  fi
+install: ./build-bin/configure_test
+script: ./build-bin/test
+```
+
+## Deploy
+
+Deploy builds and pushes artifacts to a remote repository for master and release commits on it. CI
+providers deploy pushes to master on when the tag is blank, but not on documentation-only commits.
+Releases should deploy on version tags (ex `/^[0-9]+\.[0-9]+\.[0-9]+/`), without consideration of if
+the commit is documentation only or not.
+
+ * [configure_deploy] - Sets up environment and logs in, assuming [configure_test] was not called.
+ * [deploy] - deploys the project, with arg0 being "master" or a release commit like "1.2.3"
+
+### Example GitHub Actions setup
+
+A simplest GitHub Actions `deploy.yml` deploys after logging in, but only on relevant event
+conditions. The name `deploy.yml` and job `deploy` allows easy references to status badges and
+parity of the scripts it uses.
+
+The `on:` section obviates job creation and resource usage for irrelevant events. GitHub Actions
+cannot implement "master, except documentation only-commits" in the same file. Hence, deployments of
+master will happen even on README change.
+
+Combine [configure_deploy] and [deploy] into the same `run:` when `configure_deploy` primes file
+system cache.
+
+Here's a partial `deploy.yml` including only the aspects mentioned above. Notice env variables are
+explicitly defined and `on.tags` is a [glob pattern](https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet).
+```yaml
+on:
+  push:
+    tags: '[0-9]+.[0-9]+.[0-9]+**'  # Ex. 8.272.10 or 15.0.1_p9
+    branches: master
+
+jobs:
+  deploy:
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1  # only needed to get the sha label
+      - name: Deploy
+        env:
+          GH_USER: ${{ secrets.GH_USER }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |  # GITHUB_REF will be refs/heads/master or refs/tags/MAJOR.MINOR.PATCH
+          build-bin/configure_deploy &&
+          build-bin/deploy $(echo ${GITHUB_REF} | cut -d/ -f 3)
+```
+
+### Example Travis setup
+`.travis.yml` is a monolithic configuration file broken into stages. This means `test` and `deploy`
+are in the same file. A simplest Travis `deploy` stage has two jobs: one for master pushes and
+another for version tags. These jobs are controlled by event conditions.
+
+The `if:` section obviates job creation and resource usage for irrelevant events. Travis does not
+support file conditions. A `before_install` step to skip documentation-only commits will likely
+complete in less than a minute (10 credit cost).
+
+As billing is by the minute, it is most cost effective to combine test and deploy on master push.
+
+Here's a partial `.travis.yml` including only the aspects mentioned above. Notice YAML anchors work
+in Travis and `tag =~` [condition](https://github.com/travis-ci/travis-conditions) is a regular
+expression.
+```yaml
+git:
+  depth: false  # full git history for license check, and doc-only skipping
+
+_terminate_if_only_docs: &terminate_if_only_docs |
+  if [ -n "${TRAVIS_COMMIT_RANGE}" ] && ! git diff --name-only "${TRAVIS_COMMIT_RANGE}" -- | grep -qv '\.md$'; then
+    echo "Stopping job as changes only affect documentation (ex. README.md)"
+    travis_terminate 0
+  fi
+
+jobs:
+  include:
+    - stage: test
+      if: branch = master AND tag IS blank AND type IN (push, pull_request)
+      before_install: *terminate_if_only_docs
+      install: |
+        if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+          export SHOULD_DEPLOY=true
+          ./build-bin/configure_deploy
+        else
+          export SHOULD_DEPLOY=false
+          ./build-bin/configure_test
+        fi
+      script:
+        - ./build-bin/test || travis_terminate 1
+        - if [ "${SHOULD_DEPLOY}" != "true" ]; then travis_terminate 0; fi
+        - travis_wait ./build-bin/deploy master
+    - stage: deploy
+      # Ex. 8.272.10 or 15.0.1_p9
+      if: tag =~ /^[0-9]+\.[0-9]+\.[0-9]+/ AND type = push AND env(GH_TOKEN) IS present
+      install: ./build-bin/configure_deploy
+      script: ./build-bin/deploy ${TRAVIS_TAG}
+```

data/build-bin/configure_deploy

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ue
+
+# This script sets up anything needed for `./deploy`. Do not assume `configure_test` was called.
+#
+# See [README.md] for an explanation of this and how CI should use it.
+build-bin/gem/configure_gem_credentials
+build-bin/gem/bundle_install

data/build-bin/configure_test

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ue
+
+# This script sets up anything needed for `./test`. This should not login to anything, as that
+# should be done in `configure_deploy`.
+#
+# See [README.md] for an explanation of this and how CI should use it.
+build-bin/gem/bundle_install

data/build-bin/deploy

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -ue
+
+# This script deploys a release version.
+#
+# See [README.md] for an explanation of this and how CI should use it.
+version=${1?version is required. ex 0.2.3}
+
+export BUNDLE_GEMFILE=gemfiles/faraday_1.x.gemfile
+build-bin/gem/gem_push zipkin-tracer ZipkinTracer ${version}

data/build-bin/gem/bundle_install

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright 2014-2020 The OpenZipkin Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions and limitations under
+# the License.
+#
+
+set -ue
+
+# This script ensures bundler is setup and install is run
+gem install bundler
+bundle install

data/build-bin/gem/configure_gem_credentials

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Copyright 2014-2020 The OpenZipkin Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions and limitations under
+# the License.
+#
+
+set -ue
+
+# This script configures rubygems_api_key needed to for gem-push
+
+credentials_file="${HOME}/.gem/credentials"
+mkdir -p "$(dirname "${credentials_file}")"
+cat > "${credentials_file}" <<-EOF
+---
+:rubygems_api_key: ${RUBYGEMS_API_KEY}
+EOF
+chmod 0600 "${credentials_file}"

data/build-bin/gem/gem_push

@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Copyright 2014-2020 The OpenZipkin Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions and limitations under
+# the License.
+#
+
+set -ue
+
+# This script pushes a gem version, updating version.rb if out-of-date.
+#
+# This assumes `configure_gem_credentials` and `bundle_install` were invoked.
+gem=${1?gem is required. ex zipkin-tracer}
+module=${2?module is required. ex ZipkinTracer}
+version=${3?version is required. ex 0.2.3}
+
+current_version=$(ruby -r ./lib/${gem}/version.rb -e "puts ${module}::VERSION")
+
+if [ "${current_version}" != "${version}" ]; then
+  echo "Updating ${module}::VERSION from ${current_version} to ${version}"
+  cat > lib/${gem}/version.rb <<-EOF
+# frozen_string_literal: true
+
+module ${module}
+  VERSION = '${version}'
+end
+EOF
+fi
+
+bundle exec rake build
+gem push pkg/${gem}-${version}.gem

data/build-bin/test

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -ue
+
+# This script runs the tests of the project.
+#
+# See [README.md] for an explanation of this and how CI should use it.
+bundle exec rspec

data/gemfiles/faraday_2.x.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 2.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/rack/zipkin-tracer.rb

@@ -25,6 +25,7 @@ module ZipkinTracer
           @app.call(env)
         else
           @tracer.with_new_span(trace_id, span_name(env)) do |span|
+            span.kind = Trace::Span::Kind::SERVER
             trace!(span, zipkin_env) { @app.call(env) }
           end
         end
@@ -55,7 +56,6 @@ module ZipkinTracer
     end
 
     def trace_server_information(span, zipkin_env, status)
-      span.kind = Trace::Span::Kind::SERVER
       span.record_status(status)
       SERVER_RECV_TAGS.each { |annotation_key, env_key| span.record_tag(annotation_key, zipkin_env.env[env_key]) }
     end

data/lib/zipkin-tracer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZipkinTracer
-  VERSION = '0.47.0'
+  VERSION = '0.48.0'
 end

data/lib/zipkin-tracer/zipkin_sender_base.rb

@@ -38,11 +38,9 @@ module Trace
     end
 
     def skip_flush?(span)
-      return true if span.kind == Trace::Span::Kind::CLIENT && span.has_parent_span?
+      return false if span.kind == Trace::Span::Kind::SERVER || span.kind == Trace::Span::Kind::CONSUMER
 
-      if span.kind == Trace::Span::Kind::PRODUCER
-        return true if spans.any? { |s| s.kind == Trace::Span::Kind::SERVER || s.kind == Trace::Span::Kind::CONSUMER }
-      end
+      spans.any? { |s| s.kind == Trace::Span::Kind::SERVER || s.kind == Trace::Span::Kind::CONSUMER }
     end
 
     def flush!

data/zipkin-tracer.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   end
   s.require_paths = ['lib']
 
-  s.add_dependency 'faraday', '>= 0.13', '< 2.0'
+  s.add_dependency 'faraday', '>= 0.13', '< 3.0'
   s.add_dependency 'rack', '>= 1.0'
   s.add_dependency 'sucker_punch', '~> 2.0'
 
@@ -37,5 +37,6 @@ Gem::Specification.new do |s|
   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 'webrick'
   s.add_development_dependency 'simplecov', '~> 0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipkin-tracer
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Franklin Hu
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,7 +25,7 @@ dependencies:
         version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
         version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +190,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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
@@ -217,9 +231,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE/bug.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/ISSUE_TEMPLATE/feature.md"
+- ".github/workflows/deploy.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -230,8 +249,17 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- build-bin/README.md
+- build-bin/configure_deploy
+- build-bin/configure_test
+- build-bin/deploy
+- build-bin/gem/bundle_install
+- build-bin/gem/configure_gem_credentials
+- build-bin/gem/gem_push
+- build-bin/test
 - gemfiles/faraday_0.x.gemfile
 - gemfiles/faraday_1.x.gemfile
+- gemfiles/faraday_2.x.gemfile
 - lib/zipkin-tracer.rb
 - lib/zipkin-tracer/application.rb
 - lib/zipkin-tracer/config.rb
@@ -281,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby tracing via Zipkin

data/.travis.yml

@@ -1,36 +0,0 @@
-language: ruby
-dist: bionic
-jdk: openjdk11
-
-rvm:
-  - 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:
-    secure: HJquPWOoh9YKHTJrGTBriao4wVDu/tn+JwZphPrS38PNu5FkzyRuhjq2XyBrm8BkuJWdqkVx9rpJTlFkcjIfhpZOJUn5gtTUgp12/voUMWBCWw9AUfbYdYkGhy6Lmq6miJcUFkhdeiMmnliz0Wav1ZYEWkodC25ACKQiGtk9rwr+4wKkluljOnmbyPFRiF61ZjSaz4qy9ZpwWOSPGuEjCQuvhW1hx0VNBjsio59sKUK0v2lFHxSfMjW+QrB5GAV0isv4CtG5V9MKMlRBX8+4RbklO0LHdCmykTDTioyYrfBI0x7RiO/l453/EH4dQEzivZ9AQNtIIshPu1Zht63LHWff4JyytSGxe5WmXaQjxfrZi2LMIXbeg5g2pPDmiMqFVSCgxFKJQW1eyU9pF3w5C4v9P0uLeizGnLReOwwjBDqiWIQ2bR4YWn+fsg/wbhjXHmefEjcJYL59niK8pw1JOcg7fy/P32wbbqILUcIg3of1ih1lyPV4YBY62KJny6e0c83zX2KukVMP9M6crW2NEspMqcQWFzbp3SR9oM0ziMDGUs0s1/PKVtuFTZ2S+ykbawX5P9YqSSx8iXp+Ez5MAMbrjiPXlzpzMvudDaN3kqRT2EomJ4iQjJOxXgUyTspLpZFojh4+RVjgi+sGEA8SeNiqrytThsCwQV1ro8ymL+8=
-  gem: zipkin-tracer
-  on:
-    tags: true
-    repo: openzipkin/zipkin-ruby
-    condition: $TRAVIS_RUBY_VERSION == 2.7 && $BUNDLE_GEMFILE == $TRAVIS_BUILD_DIR/gemfiles/faraday_1.x.gemfile
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/ead3c37d57527214e9f2
-      - https://webhooks.gitter.im/e/e57478303f87ecd7bffc
-    on_success: change
-    on_failure: always