opentracing-instrumentation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8879aaa3c59021d2ca28453df552f98e0d15b6770c12cf16aea578438e332013
-  data.tar.gz: '087834496d2097fe029aa460470651447f9d2bba325e95b3fd3a8cc873d137d4'
+  metadata.gz: 2f1bf3278054a44d66c91a009850b1fc7f7386285ca95158743fc16e79669ae3
+  data.tar.gz: 2f45d267611e2d6a4c376c1955a8010d7f9f6830ec1679c63b8a4fc7bb627a0e
 SHA512:
-  metadata.gz: c5c204ba373e323a0ac3ba96d1ba81a4be53ef537890304a30cb7f701ffc5ce0a989f5ac7eeb2b5c1850908d606d090dc61bff08f3ee49090a6d656b3071597d
-  data.tar.gz: fa54f0a639bf05536ba3d0fd0771c75497ba619dde142c8e1d5575fd5a782f0eb7ff0e33cc5148cd4338d6a526dc9893ade3d13c95e0f45455a00f93c0786862
+  metadata.gz: 9dc425554c43ee11d6f54d40831260a30925ba4c6b28c317c84e69873932ed34119f570698892f4239b847708209e0b82ee497e4a70dd44e859bbae87865576a
+  data.tar.gz: bd5ab5e2025f81c62b303915d272c29ab9260fc7ecfcf74abbbb2db3f2e49f12ea52f3876b7a81c3e132c3bc934baad6de01a1d221502e76ea78beac418dbee1

data/.BUNDLER_VERSION

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

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
@@ -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,4 +1,5 @@
 require:
+  - rubocop-rake
   - rubocop-rspec
   - rubocop-performance
   - rubocop-thread_safety

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.1
+- Truncate arrays into mongo command sanitazer
+
 ## 0.2.0
 - Drop support ruby 2.4
 - Support ruby 3.0

data/GEM_VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/Gemfile.lock

@@ -18,72 +18,83 @@ GIT
 PATH
   remote: .
   specs:
-    opentracing-instrumentation (0.1.18)
+    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)
+    amq-protocol (2.3.2)
     ast (2.4.2)
-    bson (4.8.0)
+    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)
-    json (2.3.0)
-    method_source (0.9.2)
+    json (2.5.1)
+    method_source (1.0.0)
     minitest (5.14.4)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     opentracing (0.5.0)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.8.0)
+    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)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    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)
+    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)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (1.15.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -98,15 +109,18 @@ GEM
     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 (2.0.0)
 
@@ -116,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)
@@ -128,11 +142,12 @@ DEPENDENCIES
   rspec (~> 3.0)
   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/mongo/query_sanitazer.rb

@@ -21,11 +21,13 @@ module OpenTracing
         def initialize(
           safety_argument_checker: SampleSafetyArgumentChecker.new,
           safe_classes: DEFAULT_SAFE_CLASSES,
+          max_array_size: 4,
           exclude_keys: DEFAULT_EXCLUDE_KEYS
         )
           super()
           @safety_argument_checker = safety_argument_checker
           @safe_classes = safe_classes
+          @max_array_size = max_array_size
           @exclude_keys = exclude_keys
         end
 
@@ -41,6 +43,7 @@ module OpenTracing
 
         attr_reader :safe_classes,
                     :exclude_keys,
+                    :max_array_size,
                     :safety_argument_checker
 
         OBJECT_ID_PLACEHOLDER = '$oid'
@@ -58,18 +61,22 @@ module OpenTracing
           end
         end
 
+        # rubocop:disable Metrics/MethodLength
         def sanitaze_simple(value)
           case value
           when BSON::ObjectId
             OBJECT_ID_PLACEHOLDER
           when String
             STRING_PLACEHOLDER
+          when ArrayItemPlaceholder
+            value.to_s
           when *safe_classes
             value
           else
             PLACEHOLDER
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def sanitaze_hash(hash)
           hash.map do |(key, value)|
@@ -86,11 +93,34 @@ module OpenTracing
           end.to_h
         end
 
+        # Placehoder for skipped array items
+        class ArrayItemPlaceholder
+          def initialize(skipped_items)
+            @skipped_items = skipped_items
+          end
+
+          def to_s
+            "SKIPPED #{@skipped_items} ITEMS"
+          end
+        end
+
         def sanitaze_array(array)
-          array.map do |value|
+          if max_array_size&.positive? && array.size > max_array_size
+            array_with_placeholder(array)
+          else
+            array
+          end.map do |value|
             sanitaze_value(value)
           end
         end
+
+        def array_with_placeholder(array)
+          prefix_size = (max_array_size / 2).ceil
+          suffix_size = max_array_size - prefix_size
+          array[0...prefix_size] \
+            + [ArrayItemPlaceholder.new(array.size - max_array_size)] \
+            + array[-suffix_size..-1]
+        end
       end
     end
   end

data/opentracing-instrumentation.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |spec|
   spec.email         = ['job@fedorenko-d.ru']
 
   spec.summary       = 'OpenTracing instrumentation for popular ruby libraries'
-  spec.description   = 'OpenTracing instrumentation for Mongo, Faraday, Rack and PORO'
+  spec.description   = 'OpenTracing instrumentation for Bunny, Faraday, Hutch, Mongo, PORO, ' \
+    'Rack, Sidekiq, Sinatra, Thrift'
   spec.homepage      = 'https://gitlab.com/c0va23/ruby-opentracing-instrumentation.'
   spec.license       = 'MIT'
 
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bson', '~> 4.0'
   spec.add_development_dependency 'bundler', File.read('.BUNDLER_VERSION').strip
   spec.add_development_dependency 'bunny', '~> 2.0'
-  spec.add_development_dependency 'faraday', '~> 1.0.1'
+  spec.add_development_dependency 'faraday', '~> 1.0'
   spec.add_development_dependency 'hutch', '~> 0.26.0'
   spec.add_development_dependency 'rack', '~> 2.2.2'
   spec.add_development_dependency 'rake', '~> 13.0'
@@ -41,7 +42,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.15.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.11.3'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.3.0'
   spec.add_development_dependency 'rubocop-thread_safety', '~> 0.4.2'
-  spec.add_development_dependency 'thrift', '~> 0.11.0'
+  spec.add_development_dependency 'thrift', '~> 0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentracing-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Fedorenko Dmitrij
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.15
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hutch
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.3
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -240,15 +254,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
-description: OpenTracing instrumentation for Mongo, Faraday, Rack and PORO
+        version: 0.14.1
+description: OpenTracing instrumentation for Bunny, Faraday, Hutch, Mongo, PORO, Rack,
+  Sidekiq, Sinatra, Thrift
 email:
 - job@fedorenko-d.ru
 executables: []
@@ -268,6 +283,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/check_gemfile_lock
 - bin/console
 - bin/setup
 - lib/opentracing/instrumentation.rb