dogstatsd-instrumentation 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95073d9c8cc7193cc51917e5bfb94169758cdc2
-  data.tar.gz: 5532096dec46a67a85e61dd456fcbd50c62a8118
+  metadata.gz: 7db0d56432676e3ada7e935438162daaee78f837
+  data.tar.gz: 77778a0c9f8048e7333e1d0af61aa1f8a925052d
 SHA512:
-  metadata.gz: cdd0ff0dab6c84f8f5e360d1e042a209598bdc3ce04114768359447764b112f195b042a52b7f39d8dbe7f44f55f17ee997656a0ce6e36cdb1586bcb7512f934b
-  data.tar.gz: 214210fa8d42de1872b3bc9e77fdbbb2f6ea86c1feafeb8a231778cff4ed347ddb5802937d2ecc9ac72a629a100cfb39ebc7e584723e311249cd30507766045f
+  metadata.gz: e17e56309a7a2138dfc3607aae45718bfdb80672b2cfc60b7d7f21a8acd5f0dbaf75bd5145211d9f89ba85f9ae47526a96f8aac9d19248c83ed718936467031e
+  data.tar.gz: 10b077d6d128fae8976f722c6018cf7fdb1b680f14300cb79c73806dbfc57dcdc64f8afbb043ccb4606665912bff06c8f0690ee39a74331e29d60bc71f85c2a8

data/lib/dogstatsd.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal true
+
+require 'active_support'
+require 'gem_config'
+require 'datadog/statsd'
+require_relative 'dogstatsd/instrumentation/client_provider'
+
+module DogStatsd
+  PUBLIC_METHODS = %w(increment decrement count gauge histogram timing time set service_check format_service_check event batch format_event).freeze
+  
+  class << self
+    extend Forwardable
+
+    def_delegators :statsd, *PUBLIC_METHODS
+
+    def statsd
+      Thread.current[:_dogstatsd_instrumentation_client] ||= Instrumentation::ClientProvider.new
+    end
+  end
+end

data/lib/dogstatsd/instrumentation.rb

@@ -2,3 +2,4 @@
 
 require "dogstatsd/instrumentation/identity"
 require "dogstatsd/instrumentation/request"
+require "dogstatsd"

data/lib/dogstatsd/instrumentation/client_provider.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'active_support'
+require 'gem_config'
+require 'datadog/statsd'
+
+module DogStatsd
+  module Instrumentation
+    module ClientProvider
+      include GemConfig::Base
+
+      with_configuration do
+        has :enabled, classes: [TrueClass, FalseClass], default: true
+        has :tags, classes: Array, default: []
+        has :tags_h, classes: Hash, default: {}
+        has :namespace, classes: String
+
+        has :host, classes: String, default: Datadog::Statsd::DEFAULT_HOST
+        has :port, classes: Integer, default: Datadog::Statsd::DEFAULT_PORT
+        has :opts, classes: Hash, default: {}
+        has :max_buffer_size, classes: Integer, default: 50
+      end
+
+      def self.new
+        client = Datadog::Statsd.new(
+          configuration.host,
+          configuration.port,
+          configuration.opts.merge(namespace: configuration.namespace, tags: configuration.tags + tagify(configuration.tags_h)),
+          configuration.max_buffer_size
+        )
+
+        def client.send_stats(stat, delta, type, opts={})
+          super if ClientProvider.configuration.enabled
+        end
+
+        client
+      end
+
+      def self.tagify(hash)
+        hash.select { |_, value| value.present? }.map { |key, value| "#{key}:#{value}" }
+      end
+    end
+  end
+end

data/lib/dogstatsd/instrumentation/identity.rb

@@ -13,7 +13,7 @@ module DogStatsd
       end
 
       def self.version
-        "0.1.3"
+        "0.1.4"
       end
 
       def self.version_label

data/lib/dogstatsd/instrumentation/request.rb

@@ -3,6 +3,7 @@
 require 'active_support'
 require 'gem_config'
 require 'datadog/statsd'
+require_relative 'client_provider'
 
 module DogStatsd
   module Instrumentation
@@ -10,34 +11,22 @@ module DogStatsd
       include GemConfig::Base
 
       with_configuration do
-        has :enabled, classes: [TrueClass, FalseClass], default: true
-        has :base_tags, classes: Hash, default: {}
-
-        has :host, classes: String, default: Datadog::Statsd::DEFAULT_HOST
-        has :port, classes: Integer, default: Datadog::Statsd::DEFAULT_PORT
-        has :opts, classes: Hash, default: {}
-        has :max_buffer_size, classes: Integer, default: 50
+        has :statsd, classes: Object
       end
 
       # From GemConfig::Base
       def self.configure
         super
-        @@subscriber = @@subscriber.unsubscribe if @@subscriber
-        @@subscriber = Subscriber.new(configuration) if configuration.enabled
+        @@subscriber.unsubscribe if @@subscriber
+
+        @@subscriber = Subscriber.new(configuration.statsd || ClientProvider.new)
       end
 
       @@subscriber = nil
 
       class Subscriber
-        def initialize(configuration)
-          @base_tags = configuration.base_tags
-
-          @statsd = Datadog::Statsd.new(
-            configuration.host,
-            configuration.port,
-            configuration.opts,
-            configuration.max_buffer_size
-          )
+        def initialize(statsd)
+          @statsd = statsd
 
           @subscriber = ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
@@ -58,7 +47,7 @@ module DogStatsd
         end
 
         def instrument(stat:, value:, tags:)
-          @statsd.histogram stat, value, tags: Subscriber.tagify(@base_tags.merge(tags))
+          @statsd.histogram stat, value, tags: Subscriber.tagify(tags)
         end
 
         def self.tagify(hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-instrumentation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marco Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
@@ -176,7 +176,9 @@ extra_rdoc_files:
 files:
 - LICENSE.md
 - README.md
+- lib/dogstatsd.rb
 - lib/dogstatsd/instrumentation.rb
+- lib/dogstatsd/instrumentation/client_provider.rb
 - lib/dogstatsd/instrumentation/identity.rb
 - lib/dogstatsd/instrumentation/request.rb
 - lib/tasks/reek.rake