instrument_all_the_things 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc79ef6d04b8966c22b1d9158f2f1449f9334ae6b4b02c1b64bed6469fe6b32
-  data.tar.gz: 9f6d5c20142cf0d9dad511b7b5c6f343ba6cb3ad6287235e4088fd50fea064be
+  metadata.gz: a3a50b9bc4c51ea31e154997452b4690b59f2003a44ff0afa8ccd7fca8cb486f
+  data.tar.gz: 4ab7a859a0e6010506e81048ab5b5b432ed359cd53ad357b3f10b61350770f9e
 SHA512:
-  metadata.gz: d3f3fa2403610b3d04e52187fa2ee1bc66d1e432d335ba0726e043a44cf32a1a40562f9d32fe3cf93326a40dd38c1e7065b07eac079a8b99122e9d77bc7a2449
-  data.tar.gz: 11c5567e0254aebcf3520a41c0bd8584e51145a7b7fe37fdfda35f669c3946b916a934bee3338da40b057a59102cc27dcda9b32469a84fb7c3bdac3419cbcc70
+  metadata.gz: f22311591588a7cf97f9b64441cda02438f4c23ee8a6100a124d8219935971da7753caed4b3ffd311cbddeb530625a9c2973a4772dfef253f0b0b817eab152a6
+  data.tar.gz: 54a7851c25d79b3ffcf596011c63cb101a83ee1fbf00d2f2acf6f49f5145d2eb67c6299b1c0b7c6ad60ef7d2bc99be64c0c515d2a6ed801c7443297c71c6847f

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.1.2

data/CHANGELOG.md

@@ -1,7 +1,3 @@
-# 1.3.1
-
-Lock to compatible versions of ddtrace. We'll need to cut a new version of this for ddtrace >= 1.
-
 # 1.2.0
 
 Remove unneeded kwargs option to support Ruby 3.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    instrument_all_the_things (1.3.0)
-      ddtrace (< 1)
-      dogstatsd-ruby
+    instrument_all_the_things (2.0.0)
+      ddtrace (~> 1.2.0)
+      dogstatsd-ruby (~> 5.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,15 +11,24 @@ GEM
     ast (2.4.2)
     benchmark-ips (2.10.0)
     coderay (1.1.3)
-    ddtrace (0.54.2)
-      debase-ruby_core_source (<= 0.10.14)
+    ddtrace (1.2.0)
+      debase-ruby_core_source (= 0.10.16)
+      libddprof (~> 0.6.0.1.0)
+      libddwaf (~> 1.3.0.2.0)
       msgpack
-    debase-ruby_core_source (0.10.14)
+    debase-ruby_core_source (0.10.16)
     diff-lcs (1.5.0)
     docile (1.4.0)
     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.5.2)
+    msgpack (1.5.3)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
@@ -43,7 +52,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.30.1)
+    rubocop (1.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -52,7 +62,7 @@ GEM
       rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -61,7 +71,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby

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 = Gem::Requirement.new('>= 2.7.0')
 
-  spec.add_dependency 'ddtrace', '< 1'
-  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/version.rb

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

data/lib/instrument_all_the_things.rb

@@ -36,9 +36,7 @@ module InstrumentAllTheThings
     end
 
     def tracer
-      return @tracer if defined?(@tracer)
-
-      @tracer ||= Datadog.tracer
+      Datadog::Tracing
     end
 
     %i[
@@ -68,10 +66,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.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ddtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        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
@@ -179,13 +179,18 @@ files:
 - vendor/cache/ast-2.4.2.gem
 - vendor/cache/benchmark-ips-2.10.0.gem
 - vendor/cache/coderay-1.1.3.gem
-- vendor/cache/ddtrace-0.54.2.gem
-- vendor/cache/debase-ruby_core_source-0.10.14.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.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.5.2.gem
+- vendor/cache/msgpack-1.5.3.gem
 - vendor/cache/parallel-1.22.1.gem
 - vendor/cache/parser-3.1.2.0.gem
 - vendor/cache/pry-0.14.1.gem
@@ -198,13 +203,13 @@ files:
 - 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.30.1.gem
-- vendor/cache/rubocop-ast-1.18.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.4.gem
-- vendor/cache/unicode-display_width-2.1.0.gem
+- vendor/cache/unicode-display_width-2.2.0.gem
 homepage: https://github.com/GetTerminus/instrument-all-the-things
 licenses: []
 metadata:
@@ -226,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Make instrumentation with DataDog easy peasy