opentracing-instrumentation 0.1.15 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d6a7f7070f79e0d57f243777fa02a2b8ac6d289b1f5bf54a3c47c171f86603
-  data.tar.gz: fb4a1c4b4260c32be8e5b12b6cc48eec27cdf7bf220cb6bb82fba9fd7ed45b3d
+  metadata.gz: 2f1bf3278054a44d66c91a009850b1fc7f7386285ca95158743fc16e79669ae3
+  data.tar.gz: 2f45d267611e2d6a4c376c1955a8010d7f9f6830ec1679c63b8a4fc7bb627a0e
 SHA512:
-  metadata.gz: 11b622db2d6df23aaa474cb5ad37a34c5a2bcd9136e92c0d966b9c36bc8cbea7ee5c3d85d31e47ceb44010dbc487b94042dedb23cf505d51ee2c1a9b8e5e700c
-  data.tar.gz: 1623f9d0ca9a70ce161db8c9350cc3228932aa24e1367b0e2beb069b920747eeffd406c34b9949c08ab0f11371a033d0202e593aa2b0c12d72c18f06bb593032
+  metadata.gz: 9dc425554c43ee11d6f54d40831260a30925ba4c6b28c317c84e69873932ed34119f570698892f4239b847708209e0b82ee497e4a70dd44e859bbae87865576a
+  data.tar.gz: bd5ab5e2025f81c62b303915d272c29ab9260fc7ecfcf74abbbb2db3f2e49f12ea52f3876b7a81c3e132c3bc934baad6de01a1d221502e76ea78beac418dbee1

data/.BUNDLER_VERSION

@@ -1 +1 @@
-2.1.4
+2.2.15

data/.drone.jsonnet

@@ -1,6 +1,6 @@
 local TestPipeline(os, arch, ruby_version) = {
   kind: "pipeline",
-  type: "docker",
+  type: "kubernetes",
   name: os + "_" + arch + "_ruby_" + ruby_version,
 
   platform: {
@@ -14,7 +14,7 @@ local TestPipeline(os, arch, ruby_version) = {
       image: "ruby:" + ruby_version + "-alpine",
       commands: [
         "apk add --update git ruby-dev build-base",
-        "gem install bundler:2.1.4",
+        "gem install bundler:$$(cat .BUNDLER_VERSION)",
         "bundle",
         "rake",
       ]
@@ -23,10 +23,10 @@ local TestPipeline(os, arch, ruby_version) = {
 };
 
 local TARGETS = [
-  {os: "linux", arch: "arm64", ruby_version: "2.4"},
   {os: "linux", arch: "arm", ruby_version: "2.5"},
   {os: "linux", arch: "arm", ruby_version: "2.6"},
   {os: "linux", arch: "arm64", ruby_version: "2.7"},
+  {os: "linux", arch: "arm64", ruby_version: "3.0"},
 ];
 
 [

data/.gitlab-ci.yml

@@ -4,6 +4,8 @@ stages:
 
 .test_shared: &test_shared
   before_script:
+  # check version should be called before any bundle calls
+  - ./bin/check_gemfile_lock
   - apk add --update
     git
     ruby-dev
@@ -14,7 +16,6 @@ stages:
 
   - export BUNDLE_PATH=vendor/
   - bundler install --jobs $(nproc)
-  - bundler update
 
   - ruby --version
   - gem --version
@@ -23,15 +24,6 @@ stages:
   script:
   - bundle exec rake
 
-test/2.4:
-  <<: *test_shared
-  stage: test
-  image: ruby:2.4-alpine
-
-  cache:
-    paths:
-    - vendor/ruby/2.4.0
-
 test/2.5:
   <<: *test_shared
   stage: test
@@ -59,6 +51,15 @@ test/2.7:
     paths:
     - vendor/ruby/2.7.0
 
+test/3.0:
+  <<: *test_shared
+  stage: test
+  image: ruby:3.0-alpine
+
+  cache:
+    paths:
+    - vendor/ruby/3.0.0
+
 publish:
   stage: publish
   image: ruby:2.7-alpine
@@ -71,7 +72,7 @@ publish:
   - export SOURCE_GEM_VERSION=$(cat GEM_VERSION)
   - test ${CI_COMMIT_TAG} == v${SOURCE_GEM_VERSION}
 
-  - export GEM_FILE_NAME="multiprotocol_thrift_rack_app-${CI_COMMIT_TAG}.gem"
+  - export GEM_FILE_NAME="opentracing-instrumentation-${CI_COMMIT_TAG}.gem"
   - export GEM_FILE_PATH="pkg/${GEM_FILE_NAME}"
 
   - mkdir -p pkg/

data/.rubocop.yml

@@ -1,11 +1,18 @@
 require:
+  - rubocop-rake
   - rubocop-rspec
   - rubocop-performance
   - rubocop-thread_safety
 
+AllCops:
+    NewCops: enable
+
 Layout/LineLength:
   Max: 100
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 18
+
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.5.0

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.2.1
+- Truncate arrays into mongo command sanitazer
+
+## 0.2.0
+- Drop support ruby 2.4
+- Support ruby 3.0
+- Update rubocop and fix new warnings

data/GEM_VERSION

@@ -1 +1 @@
-0.1.15
+0.2.1

data/Gemfile

@@ -7,13 +7,13 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in opentracing-instrumentation.gemspec
 gemspec
 
-gem 'test-tracer',
-    github: 'michal-granec/ruby-test-tracer',
-    branch: 'update_opentracing_dependencies'
-gem 'tracing-matchers',
-    github: 'c0va23/ruby-tracing-matchers',
-    branch: 'feature/michal-granec/ruby-test-tracer-compatibility'
-
 group :development do
+  gem 'test-tracer',
+      github: 'michal-granec/ruby-test-tracer',
+      branch: 'update_opentracing_dependencies'
+  gem 'tracing-matchers',
+      github: 'c0va23/ruby-tracing-matchers',
+      branch: 'feature/michal-granec/ruby-test-tracer-compatibility'
+
   gem 'pry-byebug', '~> 3.8'
 end

data/Gemfile.lock

@@ -18,92 +18,111 @@ GIT
 PATH
   remote: .
   specs:
-    opentracing-instrumentation (0.1.15)
+    opentracing-instrumentation (0.2.1)
       json
       opentracing (~> 0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.2)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amq-protocol (2.3.0)
-    ast (2.4.0)
-    bson (4.8.0)
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bson (4.12.0)
     bunny (2.14.4)
       amq-protocol (~> 2.3, >= 2.3.0)
-    byebug (11.1.1)
+    byebug (11.1.3)
     carrot-top (0.0.7)
       json
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    faraday (1.0.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     hutch (0.26.0)
       activesupport (>= 4.2, < 6)
       bunny (>= 2.12, < 2.15)
       carrot-top (~> 0.0.7)
       multi_json (~> 1.12)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
-    method_source (0.9.2)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     opentracing (0.5.0)
-    parallel (1.19.1)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    rack (2.2.2)
+      pry (~> 0.13.0)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     redis (3.3.5)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    rubocop-thread_safety (0.3.4)
-      rubocop (>= 0.51.0)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-thread_safety (0.4.2)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     thread_safe (0.3.6)
-    thrift (0.11.0.0)
-    tzinfo (1.2.6)
+    thrift (0.14.1)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -111,9 +130,9 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 5.2)
   bson (~> 4.0)
-  bundler (= 2.1.4)
+  bundler (= 2.2.15)
   bunny (~> 2.0)
-  faraday (~> 1.0.1)
+  faraday (~> 1.0)
   hutch (~> 0.26.0)
   opentracing-instrumentation!
   pry-byebug (~> 3.8)
@@ -121,13 +140,14 @@ DEPENDENCIES
   rake (~> 13.0)
   redis (~> 3.3.5)
   rspec (~> 3.0)
-  rubocop (~> 0.80.0)
-  rubocop-performance (~> 1.5.2)
-  rubocop-rspec (~> 1.38.1)
-  rubocop-thread_safety (~> 0.3.4)
+  rubocop (~> 1.15.0)
+  rubocop-performance (~> 1.11.3)
+  rubocop-rake (~> 0.5.1)
+  rubocop-rspec (~> 2.3.0)
+  rubocop-thread_safety (~> 0.4.2)
   test-tracer!
-  thrift (~> 0.11.0)
+  thrift (~> 0.14.1)
   tracing-matchers!
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/bin/check_gemfile_lock

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+GEMFILE_LOCK_PATH=Gemfile.lock
+GEM_VERSION_PATH=GEM_VERSION
+
+gem_versio=$(cat "${GEM_VERSION_PATH}")
+
+expected_line="opentracing-instrumentation (${gem_versio})"
+
+grep "${expected_line}" "${GEMFILE_LOCK_PATH}" > /dev/null
+exit_code=$?
+
+if [ $exit_code != 0 ]; then
+    echo "Update gem version ${GEMFILE_LOCK_PATH} and commit it" > /dev/stderr
+    exit 1
+else
+    echo "Gem version into ${GEMFILE_LOCK_PATH} valid" > /dev/stdout
+fi

data/lib/opentracing/instrumentation/bunny.rb

@@ -10,27 +10,27 @@ module OpenTracing
       module_path = 'opentracing/instrumentation/bunny'
 
       autoload :ConsumeOperationNameBuilder,
-               module_path + '/consume_operation_name_builder'
+               "#{module_path}/consume_operation_name_builder"
       autoload :ConsumeTagsBuilder,
-               module_path + '/consume_tags_builder'
+               "#{module_path}/consume_tags_builder"
       autoload :ConsumeTracer,
-               module_path + '/consume_tracer'
+               "#{module_path}/consume_tracer"
       autoload :ConsumeTracerConfig,
-               module_path + '/consume_tracer_config'
+               "#{module_path}/consume_tracer_config"
       autoload :HeadersBuilder,
-               module_path + '/headers_builder'
+               "#{module_path}/headers_builder"
       autoload :HeadersInjector,
-               module_path + '/headers_injector'
+               "#{module_path}/headers_injector"
       autoload :PublishOperationNameBuilder,
-               module_path + '/publish_operation_name_builder'
+               "#{module_path}/publish_operation_name_builder"
       autoload :PublishTagsBuilder,
-               module_path + '/publish_tags_builder'
+               "#{module_path}/publish_tags_builder"
       autoload :PublishTracer,
-               module_path + '/publish_tracer'
+               "#{module_path}/publish_tracer"
       autoload :PublishTracerConfig,
-               module_path + '/publish_tracer_config'
+               "#{module_path}/publish_tracer_config"
       autoload :RegexpRoutingKeySanitazer,
-               module_path + '/regexp_routing_key_sanitazer'
+               "#{module_path}/regexp_routing_key_sanitazer"
     end
   end
 end

data/lib/opentracing/instrumentation/bunny/regexp_routing_key_sanitazer.rb

@@ -32,7 +32,7 @@ module OpenTracing
         def sanitaze_routing_key(routing_key)
           routing_key
             .split(ROUTING_KEY_SEPARATOR)
-            .map(&method(:filter_part))
+            .map { |part| filter_part(part) }
             .join(ROUTING_KEY_SEPARATOR)
         end
 

data/lib/opentracing/instrumentation/common.rb

@@ -8,6 +8,8 @@ module OpenTracing
     module Common
       autoload :ErrorWriter,
                'opentracing/instrumentation/common/error_writer'
+      autoload :OperationNameBuilder,
+               'opentracing/instrumentation/common/operation_name_builder'
     end
   end
 end

data/lib/opentracing/instrumentation/common/error_writer.rb

@@ -10,8 +10,8 @@ module OpenTracing
         LOG_ERROR_EVENT = 'error'
         ERROR_TAG = 'error'
 
-        attr_reader :set_error_tag
-        attr_reader :log_error_event
+        attr_reader :set_error_tag,
+                    :log_error_event
 
         # @param set_error_tag [TrueClass,ErrorClass] enable set error tag
         # @param log_error_event [TrueClass, ErrorClass] enable log exception