instrument_all_the_things 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a589699de098a3b92a317e37a7a901f6d3d90868fd889a41a1c7e04ebaa124
-  data.tar.gz: 2f7b79adb14a1ac4fcfc85f8993508d357d6bcd4caa63b9e1f482c95dcf9b85e
+  metadata.gz: 128ce1a0db87a3ae766c72e856519dcfa356c6dcb4b71ac0debbbff0d2026a1b
+  data.tar.gz: 50845ff64582662567623779a5caa6cc6118c13b4e4cce520656f3c75dcce1a5
 SHA512:
-  metadata.gz: 6403abcf56557ca5dcd873c3f7133d6947eab41a4a1854cc7d25d8e0b55879478691d5682fa27c54833fa4e750c4893230852bd4edc6c2ac9516f1c2d720fa8d
-  data.tar.gz: ced3427628d48fc19f064b93c2647d991e0fbe4eec76e9365d1b7184d171b4c86d06b5d1ad0ac037eee703cc3a0f1d16beea4b13b1c1cd39d7ae6b4ba12c4f32
+  metadata.gz: 02a41d1ceb496c3ed1e2f62c278831fde669388d33214ae39abfff6d7ef52c93831c08610d7aa33456dbede44af846213e2a7deffdce8345685aae755012b525
+  data.tar.gz: 517a4cd139e4af87dc76cb9daa409c1f097345671d5cb1656bb878fc6a3e81fbfafd58e40d7df85620194172558c8d82a965444905b9ee287d3ebd63239c8247

data/.github/workflows/lint.yaml

@@ -0,0 +1,21 @@
+name: 'Lint'
+
+on: push
+
+jobs:
+  run-rubocop:
+    name: Lint code
+    strategy:
+      fail-fast: false
+      matrix:
+        rubyVersion: ["2.7.6"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.rubyVersion }}
+          bundler-cache: true
+          cache-version: "${{ matrix.rubyVersion }}-0"
+      - name: Run RuboCop
+        run: bundle exec rubocop

data/.github/workflows/test.yaml

@@ -0,0 +1,31 @@
+name: Test
+
+on: push
+
+jobs:
+  run-tests:
+    name: Test code
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 3.1.2
+          - 3.0.4
+          - 2.7.6
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cache-version: ${{ matrix.ruby }}-0
+      - name: Run RSpec
+        env:
+          CI: true
+        run: bundle exec rspec
+      - name: Coveralls
+        uses: coverallsapp/github-action@v1.1.2
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 .DS_Store
 .vscode
+
+instrument_all_the_things*.gem

data/.rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-yml

@@ -0,0 +1,91 @@
+AllCops:
+  Exclude:
+    - Makefile
+    - vendor/**/*
+    - bin/**/*
+
+Layout/EndOfLine:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Lint/Debugger:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: true
+
+Layout/LineLength:
+  Enabled: true
+  Max: 280
+  IgnoreCopDirectives: true
+  IgnoredPatterns: ['\A#', '\A\s*sig { .* }\Z']
+  Exclude:
+    - '**/*_pb.rb'
+
+Metrics/AbcSize:
+  Enabled: true
+  Max: 48
+
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+Metrics/MethodLength:
+  Enabled: true
+  Max: 32
+
+Layout/ParameterAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Naming/MethodParameterName:
+  Enabled: true
+  AllowedNames: ['io', 'id', 'to', 'by', 'on', 'in', 'at', '_'] # Defaults + _
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Style/ParallelAssignment:
+  Enabled: true
+
+Metrics/ClassLength:
+  Max: 240
+
+Metrics/BlockLength:
+  Max: 30
+  Exclude:
+    - spec/**/*.rb
+    - '**/*_pb.rb'
+
+Metrics/ParameterLists:
+  Max: 6
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*.rb
+
+Style/BlockDelimiters:
+  Enabled: true
+  Exclude:
+    - spec/**/*

data/.rubocop.yml

@@ -2,12 +2,13 @@ inherit_from: https://raw.githubusercontent.com/GetTerminus/ruby_shared_configs/
 
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - Makefile
     - vendor/**/*
     - bin/*
     - Guardfile
+    - lib/instrument_all_the_things/thread.rb
 
 Naming/AccessorMethodName:
   Exclude:

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

data/Gemfile.lock

@@ -1,67 +1,77 @@
 PATH
   remote: .
   specs:
-    instrument_all_the_things (1.3.0)
-      ddtrace
-      dogstatsd-ruby
+    instrument_all_the_things (2.0.1)
+      ddtrace (~> 1.2.0)
+      dogstatsd-ruby (~> 5.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    benchmark-ips (2.9.1)
+    benchmark-ips (2.10.0)
     coderay (1.1.3)
-    ddtrace (0.52.0)
-      ffi (~> 1.0)
+    ddtrace (1.2.0)
+      debase-ruby_core_source (= 0.10.16)
+      libddprof (~> 0.6.0.1.0)
+      libddwaf (~> 1.3.0.2.0)
       msgpack
-    diff-lcs (1.4.4)
+    debase-ruby_core_source (0.10.16)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    dogstatsd-ruby (5.2.0)
-    ffi (1.15.4)
+    dogstatsd-ruby (5.5.0)
+    ffi (1.15.5)
+    json (2.6.2)
+    libddprof (0.6.0.1.0)
+    libddwaf (1.3.0.2.0)
+      ffi (~> 1.0)
+    libddwaf (1.3.0.2.0-x86_64-darwin)
+      ffi (~> 1.0)
     method_source (1.0.0)
-    msgpack (1.4.2)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    msgpack (1.5.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (10.5.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     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)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    unicode-display_width (2.1.0)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby
@@ -78,4 +88,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.2.22
+   2.3.12

data/README.md

@@ -129,7 +129,7 @@ require 'instrument_all_the_things/testing/trace_tracker'
 require 'instrument_all_the_things/testing/rspec_matchers'
 
 Datadog.configure do |c|
-  c.tracer transport_options: proc { |t|
+  c.tracing.transport_options = proc { |t|
     t.adapter :test, IATT::Testing::TraceTracker.new
   }
 end

data/instrument_all_the_things.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|Gemfile.lock)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
-  spec.add_dependency 'ddtrace'
-  spec.add_dependency 'dogstatsd-ruby'
+  spec.add_dependency 'ddtrace', '~> 1.2.0'
+  spec.add_dependency 'dogstatsd-ruby', '~> 5.5.0'
 
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/instrument_all_the_things/instrumentors/tracing.rb

@@ -3,7 +3,6 @@
 module InstrumentAllTheThings
   module Instrumentors
     DEFAULT_TRACE_OPTIONS = {
-      service: '',
       span_type: '',
       tags: {},
       span_name: 'method.execution',
@@ -23,7 +22,7 @@ module InstrumentAllTheThings
         passed_ops[:resource] ||= context.trace_name(klass)
         passed_ops[:tags] ||= {}
 
-        InstrumentAllTheThings.tracer.trace(span_name, passed_ops) do
+        InstrumentAllTheThings.tracer.trace(span_name, **passed_ops) do
           next_blk.call(klass, actual_code)
         end
       end

data/lib/instrument_all_the_things/testing/rspec_matchers.rb

@@ -81,7 +81,7 @@ module InstrumentAllTheThings
       end
 
       def flush_traces
-        Datadog.tracer&.writer&.worker&.flush_data
+        Datadog::Tracing.send(:tracer)&.writer&.worker&.flush_data
       end
 
       def emitted_spans(filtered_by: nil)

data/lib/instrument_all_the_things/thread.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'ddtrace'
+
+# https://github.com/DataDog/dd-trace-rb/blob/master/docs/UpgradeGuide.md#between-threads
+class Thread
+  def self.new_traced
+    trace = Datadog::Tracing.active_trace
+    trace_digest = trace.to_digest
+
+    Thread.new do |*args|
+       # Inherits trace properties from the trace digest
+      Datadog::Tracing.trace(trace.name, continue_from: trace_digest) do |_span, trace|
+        trace.id == trace_digest.trace_id
+        yield(*args)
+      end
+    end
+  end
+end

data/lib/instrument_all_the_things/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InstrumentAllTheThings
-  VERSION = '1.3.0'
+  VERSION = '2.0.1'
 end

data/lib/instrument_all_the_things.rb

@@ -6,6 +6,7 @@ require 'instrument_all_the_things/version'
 
 require_relative './instrument_all_the_things/helpers'
 require_relative './instrument_all_the_things/clients/stat_reporter/datadog'
+require_relative './instrument_all_the_things/thread'
 
 module InstrumentAllTheThings
   class Error < StandardError; end
@@ -36,9 +37,7 @@ module InstrumentAllTheThings
     end
 
     def tracer
-      return @tracer if defined?(@tracer)
-
-      @tracer ||= Datadog.tracer
+      Datadog::Tracing
     end
 
     %i[
@@ -68,10 +67,6 @@ module InstrumentAllTheThings
     tracer&.active_span&.set_tags(to_tracer_tags(tag_name => tag_value))
   end
 
-  def self.tag_active_root_span(tag_name, tag_value)
-    tracer&.active_span&.set_tags(to_tracer_tags(tag_name => tag_value))
-  end
-
   def self.to_tracer_tags(hsh, prefix = nil)
     hsh.each_with_object({}) do |(hash_key, value), acc|
       key = prefix ? "#{prefix}.#{hash_key}" : hash_key

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: instrument_all_the_things
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ddtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.5.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -143,9 +143,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".drone.yml"
+- ".github/workflows/lint.yaml"
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop-https---raw-githubusercontent-com-GetTerminus-ruby-shared-configs-master--rubocop-yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -172,35 +174,43 @@ files:
 - lib/instrument_all_the_things/testing/rspec_matchers.rb
 - lib/instrument_all_the_things/testing/stat_tracker.rb
 - lib/instrument_all_the_things/testing/trace_tracker.rb
+- lib/instrument_all_the_things/thread.rb
 - lib/instrument_all_the_things/version.rb
 - logo.jpg
 - vendor/cache/ast-2.4.2.gem
-- vendor/cache/benchmark-ips-2.9.1.gem
+- vendor/cache/benchmark-ips-2.10.0.gem
 - vendor/cache/coderay-1.1.3.gem
-- vendor/cache/ddtrace-0.52.0.gem
-- vendor/cache/diff-lcs-1.4.4.gem
+- vendor/cache/ddtrace-1.2.0.gem
+- vendor/cache/debase-ruby_core_source-0.10.16.gem
+- vendor/cache/diff-lcs-1.5.0.gem
 - vendor/cache/docile-1.4.0.gem
-- vendor/cache/dogstatsd-ruby-5.2.0.gem
-- vendor/cache/ffi-1.15.4.gem
+- vendor/cache/dogstatsd-ruby-5.5.0.gem
+- vendor/cache/ffi-1.15.5.gem
+- vendor/cache/json-2.6.2.gem
+- vendor/cache/libddprof-0.6.0.1.0.gem
+- vendor/cache/libddwaf-1.3.0.2.0-x86_64-darwin.gem
+- vendor/cache/libddwaf-1.3.0.2.0.gem
 - vendor/cache/method_source-1.0.0.gem
-- vendor/cache/msgpack-1.4.2.gem
-- vendor/cache/parallel-1.21.0.gem
-- vendor/cache/parser-3.0.2.0.gem
+- vendor/cache/msgpack-1.5.4.gem
+- vendor/cache/parallel-1.22.1.gem
+- vendor/cache/parser-3.1.2.0.gem
 - vendor/cache/pry-0.14.1.gem
-- vendor/cache/rainbow-3.0.0.gem
+- vendor/cache/rainbow-3.1.1.gem
 - vendor/cache/rake-10.5.0.gem
-- vendor/cache/regexp_parser-2.1.1.gem
+- vendor/cache/regexp_parser-2.5.0.gem
 - vendor/cache/rexml-3.2.5.gem
-- vendor/cache/rspec-3.10.0.gem
-- vendor/cache/rspec-core-3.10.1.gem
-- vendor/cache/rspec-expectations-3.10.1.gem
-- vendor/cache/rspec-mocks-3.10.2.gem
-- vendor/cache/rspec-support-3.10.2.gem
+- vendor/cache/rspec-3.11.0.gem
+- vendor/cache/rspec-core-3.11.0.gem
+- vendor/cache/rspec-expectations-3.11.0.gem
+- vendor/cache/rspec-mocks-3.11.1.gem
+- vendor/cache/rspec-support-3.11.0.gem
+- vendor/cache/rubocop-1.31.2.gem
+- vendor/cache/rubocop-ast-1.19.1.gem
 - vendor/cache/ruby-progressbar-1.11.0.gem
 - vendor/cache/simplecov-0.21.2.gem
 - vendor/cache/simplecov-html-0.12.3.gem
-- vendor/cache/simplecov_json_formatter-0.1.3.gem
-- vendor/cache/unicode-display_width-2.1.0.gem
+- vendor/cache/simplecov_json_formatter-0.1.4.gem
+- vendor/cache/unicode-display_width-2.2.0.gem
 homepage: https://github.com/GetTerminus/instrument-all-the-things
 licenses: []
 metadata:
@@ -215,14 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Make instrumentation with DataDog easy peasy

data/.drone.yml

@@ -1,14 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-- name: test-ruby
-  image: getterminus/ruby-ci-image:2.6-je-20190205
-  group: bundler
-  volumes:
-    - name: bundledir
-      path: /usr/local/bundle
-  commands:
-    - bundle check --path=/usr/local/bundle || bundle --local --path=/usr/local/bundle
-    - bundle exec rspec
-