ddtrace 0.34.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717c60b6febb326c72e9361843a18053a750286a
-  data.tar.gz: 64048e72e26379dc63c48e48511f0b05190ad462
+  metadata.gz: 693e84ab50a280cbb8bf7b9aff22a6a946299116
+  data.tar.gz: 12288885ea1d1fcde3bfb598e83283233742fc87
 SHA512:
-  metadata.gz: 43197310ce4fb1599f272721f47a764ceba75ab11344521089b5e70d8ca6e9eabefec7138de86e9d3001bbe3983f5c501e198822ecc270a1b6542b8832f1af0b
-  data.tar.gz: d3902ad6888f33faf5feea994d0abeed8625b094809407beb88de25fd43a35fc84bb0ce14d5589138f9b52e19932ad421c4f7f13005ef6f3890f6ca0301ecc40
+  metadata.gz: 3510e628728248839225a76f20b9241375f447da044afe84f77e99b46db6ec9895702f938be873779364c5b1342a92b93c991ef7ef84f462da1783b138373da1
+  data.tar.gz: 26455c489bc375b7305dfcb998498337b9a2506530481759de75b9e599ccb798d8eca24aa1de784cc7bdc1d7470d93abeaccf0e5198ca731b948938260ab9f82

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [0.34.1] - 2020-04-02
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.34.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.34.0...v0.34.1
+
+### Changed
+
+- Rails applications set default `service` and `env` if none are configured. (#990)
+
+### Fixed
+
+- Some configuration settings not applying (#989, #990) (@rahul342)
+
 ## [0.34.0] - 2020-03-31
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.34.0
@@ -1140,7 +1154,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.34.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.34.1...master
+[0.34.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.34.0...v0.34.1
 [0.34.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.33.1...v0.34.0
 [0.33.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.33.0...v0.33.1
 [0.33.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.32.0...v0.33.0

data/lib/ddtrace/configuration/settings.rb

@@ -63,6 +63,7 @@ module Datadog
       option :env do |o|
         o.default { ENV.fetch(Ext::Environment::ENV_ENVIRONMENT, nil) }
         o.lazy
+        o.on_set { |value| get_option(:tracer).set_tags('env' => value) }
       end
 
       option :report_hostname do |o|
@@ -100,6 +101,7 @@ module Datadog
       option :service do |o|
         o.default { ENV.fetch(Ext::Environment::ENV_SERVICE, nil) }
         o.lazy
+        o.on_set { |value| get_option(:tracer).default_service = value }
       end
 
       option :tags do |o|
@@ -119,6 +121,16 @@ module Datadog
           tags
         end
 
+        o.setter do |new_value, old_value|
+          # Coerce keys to strings
+          string_tags = Hash[new_value.collect { |k, v| [k.to_s, v] }]
+
+          # Merge with previous tags
+          (old_value || {}).merge(string_tags)
+        end
+
+        o.on_set { |value| get_option(:tracer).set_tags(value) }
+
         o.lazy
       end
 
@@ -168,6 +180,7 @@ module Datadog
       option :version do |o|
         o.default { ENV.fetch(Ext::Environment::ENV_VERSION, nil) }
         o.lazy
+        o.on_set { |value| get_option(:tracer).set_tags('version' => value) }
       end
     end
   end

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

@@ -32,14 +32,27 @@ module Datadog
 
           # By default, default service would be guessed from the script
           # being executed, but here we know better, get it from Rails config.
-          config[:tracer].default_service = config[:service_name]
+          # Don't set this if service has been explicitly provided by the user.
+          Datadog.configuration.service ||= config[:service_name]
+
+          # Set the environment to the Rails environment.
+          # Don't set this if env has been explicitly provided by the user.
+          Datadog.configuration.env ||= ::Rails.env if ::Rails.respond_to?(:env)
+
+          # Update the tracer if its not the default tracer.
+          if config[:tracer] != Datadog.configuration.tracer
+            config[:tracer].default_service = config[:service_name]
+
+            env = Datadog.configuration.env || (::Rails.respond_to?(:env) && ::Rails.env)
+            config[:tracer].set_tags('env' => env) if env
+          end
         end
 
         def self.config_with_defaults
           # We set defaults here instead of in the patcher because we need to wait
           # for the Rails application to be fully initialized.
           Datadog.configuration[:rails].tap do |config|
-            config[:service_name] ||= Utils.app_name
+            config[:service_name] ||= (Datadog.configuration.service || Utils.app_name)
             config[:database_service] ||= "#{config[:service_name]}-#{Contrib::ActiveRecord::Utils.adapter_name}"
             config[:controller_service] ||= config[:service_name]
             config[:cache_service] ||= "#{config[:service_name]}-cache"

data/lib/ddtrace/span.rb

@@ -173,7 +173,7 @@ module Datadog
       # spans without a service would be dropped, so here we provide a default.
       # This should really never happen with integrations in contrib, as a default
       # service is always set. It's only for custom instrumentation.
-      @service ||= (Datadog.configuration.service || (@tracer && @tracer.default_service))
+      @service ||= (@tracer && @tracer.default_service)
 
       begin
         @context.close_span(self)

data/lib/ddtrace/tracer.rb

@@ -85,6 +85,7 @@ module Datadog
 
       @mutex = Mutex.new
       @tags = options.fetch(:tags, Datadog.configuration.tags)
+      @default_service = options.fetch(:default_service, Datadog.configuration.service)
 
       # Enable priority sampling by default
       activate_priority_sampling!(@sampler)

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 34
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.34.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack