ddtrace 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d73e549b6967c251ed2a24da73b2745be09bab
-  data.tar.gz: d277e842f72258951601bccb39922a5159df6c3c
+  metadata.gz: 9dc26d3b7ce6a1750bd273655bfb068604249878
+  data.tar.gz: 9c431f39db93b20c1d3c854e8efa1cb3b8d030b4
 SHA512:
-  metadata.gz: 0b4f2105c282e56f3e7ec30bba4b728b57ef934f7479f9308aee09eb4e8ad936cd5ff64ae7073892f09ef24b0867c71e158aceb1f93348c32639c8360b24193b
-  data.tar.gz: 6f1c67ab6bafc6d2e94e436a21cca2d0a4c5b220c8acfe3fcb0255f09c08efe02e86d13fd69d8d97c9c90b6eec024375702103a39323d43df2e5e637aa546d9d
+  metadata.gz: 044bc1ebc2a9e74f66754fbe3514563a8f8ad735e3547bcdc7ca61e508cbd3fac52a7f16d451d719c5402f05272a5f3ea7951b57a7c155fcc27b897cae063a62
+  data.tar.gz: 29ce52bf23933396a5d45b2467d43c0a9b1642769f6119fe22c8f38b544b2c796cf309366de063498f3ad07e4026dd48d18ac03179f24952cf31d96fb5b7597c

data/.rubocop.yml

@@ -41,3 +41,9 @@ Metrics/BlockLength:
 
 Metrics/ParameterLists:
   Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Max: 15

data/lib/ddtrace/contrib/elasticsearch/core.rb

@@ -36,20 +36,28 @@ module Datadog
           url = full_url.path
           response = nil
           pin.tracer.trace('elasticsearch.query') do |span|
-            span.service = pin.service
-            span.span_type = SPAN_TYPE
+            begin
+              span.service = pin.service
+              span.span_type = SPAN_TYPE
 
-            span.set_tag(METHOD, method)
-            span.set_tag(URL, url)
-            span.set_tag(PARAMS, JSON.generate(params)) if params
-            span.set_tag(BODY, JSON.generate(body)) if body
+              # load JSON for the following fields unless they're already strings
+              params = JSON.generate(params) if params && !params.is_a?(String)
+              body = JSON.generate(body) if body && !body.is_a?(String)
 
-            quantized_url = Datadog::Contrib::Elasticsearch::Quantize.format_url(url)
-            span.resource = "#{method} #{quantized_url}"
+              span.set_tag(METHOD, method)
+              span.set_tag(URL, url)
+              span.set_tag(PARAMS, params) if params
+              span.set_tag(BODY, body) if body
 
-            response = super(*args)
+              quantized_url = Datadog::Contrib::Elasticsearch::Quantize.format_url(url)
+              span.resource = "#{method} #{quantized_url}"
+            rescue StandardError => e
+              Datadog::Tracer.log.error(e.message)
+            ensure
+              # the call is still executed
+              response = super(*args)
+            end
           end
-
           response
         end
       end

data/lib/ddtrace/contrib/http/patcher.rb

@@ -14,8 +14,6 @@ module Datadog
 
       module_function
 
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity
       def should_skip_tracing?(req, address, port, transport, pin)
         # we don't want to trace our own call to the API (they use net/http)
         # when we know the host & port (from the URI) we use it, else (most-likely

data/lib/ddtrace/contrib/rails/active_support.rb

@@ -93,7 +93,9 @@ module Datadog
           begin
             # finish the tracing and update the execution time
             span.resource = resource
-            span.set_tag('rails.cache.backend', ::Rails.configuration.cache_store)
+            # discard parameters from the cache_store configuration
+            store, = *Array.wrap(::Rails.configuration.cache_store).flatten
+            span.set_tag('rails.cache.backend', store)
             span.set_tag('rails.cache.key', payload.fetch(:key))
 
             if payload[:exception]

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -85,9 +85,7 @@ module Datadog
         end
 
         # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/MethodLength
-        # rubocop:disable Metrics/PerceivedComplexity
         def self.registered(app)
           ::Sinatra::Base.module_eval do
             def render(engine, data, *)

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack