instrument_all_the_things 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bcc57ca40a267c78c39c37d55711d1ca2ca33637c115b293e9f679b5950b6e7
-  data.tar.gz: 720d12fbd72e5c7bb7b82f9088c882037cc6c2ba675f3f7c097bfcfdb03771e5
+  metadata.gz: ac64a9b7acfa4de004260992b1c4f664587345e692a6f08f9798442b0568619d
+  data.tar.gz: 6bd26e6ea3186c4ca0883a4a2971dc2980f0c71409f6654a5da1ab183539b372
 SHA512:
-  metadata.gz: 2a99e6d00c90458e247bb4a018d2abd23774aec7d2c660bdad9e0e6e22dc9b29058e2d605f4dd0fa126084bb2163721fb1e2e8670b1521c488718d3e1d225010
-  data.tar.gz: 9e9ea9639a45dd1f766882bb2ae355a4e9029a388a9421849d681389d8595de5f7cf81ac38f7648add79b4db7582320bc33ccdf057cc352e6634b6ee8c392dad
+  metadata.gz: 97d28f7d5a86fbaf0cc1a9792ad26d39cc2a34ddc9bbbba9c82d413f19b785136af1319dc27f1a44c72f494b701fcf11003743edae6276c30a0ec100da054de8
+  data.tar.gz: d78092b9f1ad421ba8674ad830821558399dd471117f4fe1efda3905ef0dc472e421c4105288790582d76f15d60f8881a3da6554050ff69f50ae1a071e46fc19

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 .DS_Store
+.vscode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    instrument_all_the_things (1.0.2)
+    instrument_all_the_things (1.0.3)
       ddtrace
       dogstatsd-ruby
 
@@ -11,7 +11,7 @@ GEM
     ast (2.4.0)
     benchmark-ips (2.7.2)
     coderay (1.1.2)
-    ddtrace (0.33.0)
+    ddtrace (0.33.1)
       msgpack
     diff-lcs (1.3)
     docile (1.3.2)

data/lib/instrument_all_the_things.rb

@@ -33,7 +33,7 @@ module InstrumentAllTheThings
       @stat_reporter ||= Clients::StatReporter::DataDog.new(
         ENV.fetch('DATADOG_HOST', 'localhost'),
         ENV.fetch('DATADOG_PORT', 8125),
-        namespace: stat_namespace
+        namespace: stat_namespace,
       )
     end
 

data/lib/instrument_all_the_things/context.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module InstrumentAllTheThings
-  Context = Struct.new(:method_name, :instance, keyword_init: true) do
+  Context = Struct.new(:method_name, :instance, :tags, keyword_init: true) do
     def stats_name(klass_or_instance)
       @stats_name ||= [
         class_name(klass_or_instance),

data/lib/instrument_all_the_things/instrumentors/execution_count_and_timing.rb

@@ -2,17 +2,18 @@
 
 module InstrumentAllTheThings
   module Instrumentors
-    DEFAULT_EXECUTION_COUNT_AND_TIMING_OPTIONS = { }.freeze
+    DEFAULT_EXECUTION_COUNT_AND_TIMING_OPTIONS = {}.freeze
 
-    EXECUTION_COUNT_AND_TIMING_WRAPPER = proc do |opts, context|
+    EXECUTION_COUNT_AND_TIMING_WRAPPER = proc do |_opts, context|
       proc do |klass, next_blk, actual_code|
-        InstrumentAllTheThings.increment("#{context.stats_name(klass)}.executed")
+        context.tags ||= []
 
-        InstrumentAllTheThings.time("#{context.stats_name(klass)}.duration") do
+        InstrumentAllTheThings.increment("#{context.stats_name(klass)}.executed", { tags: context.tags })
+        InstrumentAllTheThings.time("#{context.stats_name(klass)}.duration", { tags: context.tags }) do
           next_blk.call(klass, actual_code)
         end
-      rescue
-        InstrumentAllTheThings.increment("#{context.stats_name(klass)}.errored")
+      rescue StandardError
+        InstrumentAllTheThings.increment("#{context.stats_name(klass)}.errored", { tags: context.tags })
         raise
       end
     end

data/lib/instrument_all_the_things/instrumentors/tracing.rb

@@ -19,7 +19,7 @@ module InstrumentAllTheThings
       proc do |klass, next_blk, actual_code|
         InstrumentAllTheThings.tracer.trace(
           opts[:span_name],
-          tags: opts[:tags],
+          tags: context[:tags] || {},
           service: opts[:service],
           resource: opts[:resource] || context.trace_name(klass),
           span_type: opts[:span_type]

data/lib/instrument_all_the_things/method_proxy.rb

@@ -40,10 +40,30 @@ module InstrumentAllTheThings
         @_iatt_built_for = val
       end
 
+      def set_context_tags(klass, settings, *args, **kwargs) # rubocop:disable Lint/UnusedMethodArgument
+        return unless settings.is_a?(Hash) && settings[:trace].is_a?(Hash) && settings[:trace][:tags]
+
+        settings[:context][:tags] = settings[:trace][:tags].map do |tag|
+          if tag.is_a?(Proc)
+            if tag.arity == 1
+              tag.call(eval(tag.parameters[0][1].to_s))
+            else
+              klass.instance_exec(&tag)
+            end
+          else
+            tag
+          end
+        rescue StandardError
+          nil
+        end.compact
+      end
+
       def wrap_implementation(method_name, settings)
         wrap = MethodInstrumentor.new(**settings)
+        set_tags = method(:set_context_tags)
 
         define_method(method_name) do |*args, **kwargs, &blk|
+          set_tags.call(self, settings, args, kwargs)
           wrap.invoke(klass: is_a?(Class) ? self : self.class) do
             super(*args, **kwargs, &blk)
           end

data/lib/instrument_all_the_things/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instrument_all_the_things
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ddtrace
@@ -176,7 +176,7 @@ files:
 - vendor/cache/ast-2.4.0.gem
 - vendor/cache/benchmark-ips-2.7.2.gem
 - vendor/cache/coderay-1.1.2.gem
-- vendor/cache/ddtrace-0.33.0.gem
+- vendor/cache/ddtrace-0.33.1.gem
 - vendor/cache/diff-lcs-1.3.gem
 - vendor/cache/docile-1.3.2.gem
 - vendor/cache/dogstatsd-ruby-4.7.0.gem
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Make instrumentation with DataDog easy peasy