yabeda-datadog 0.3.0.rc1 → 0.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2600b842315a1b8dfde3a722c1c6b75b0c88a66146a439d3d2d59e48553bbaa
-  data.tar.gz: df24c470280a87e6fefdc68d90296a33fc7ce1bdcae900e530cb59106b099ab9
+  metadata.gz: fb61ee60dd8cb6880dec64261548efbccadfc94b3db18d399e96effd6b4ed67a
+  data.tar.gz: e5261178b107deae7322aa0213364ed3fdc1c0e90a35569b0dbf996ebedc902b
 SHA512:
-  metadata.gz: edec9182d5535f62cbd2e38efd3a1f5b2ab11f33f76616d0a8706c8ff79a109cd00e6933a19a20737686891f5c6ea919e253657017c5c1fac05d54bd30dd98d7
-  data.tar.gz: 67ecae6205e8f9286a563caeb98813359d7e3888d15b02b0ff23711835f429cddbf18096395d9e97d37728d8716de009616ba2f8bf4f16ac968b6d006b632482
+  metadata.gz: aca81cd6e6bd2cadb2d69f1157e78e8b47637620ccddf70326310314248844cccd9208f369023a4a6753e4ca1e72a3d655efcc485dbc2b3d6d36cd1d025f3da5
+  data.tar.gz: 65efeb747cd54eeb009491e26d9f3ae9fa3f77f880afc36c672af679137c9197fd9663fe795451ec1869cfa3ba12828c730e7bc850cb42e1438cd9c8fd53578f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yabeda-datadog (0.3.0.rc1)
+    yabeda-datadog (0.3.0.rc2)
       anyway_config (~> 1.0)
       dogapi
       dogstatsd-ruby

data/README.md

@@ -52,6 +52,9 @@ num_threads: 2
 # Datadog agent host and port
 agent_host: localhost
 agent_port: 8125
+# Logging severity threshold, you have to pass integer related to Logger Ruby class
+# has 1 value by default which is Logger::INFO
+log_level: 1
 ```
 
 Example of environment variables:
@@ -71,13 +74,16 @@ YABEDA_DATADOG_NUM_THREADS=2
 # Datadog agent host and port
 YABEDA_DATADOG_AGENT_HOST=localhost
 YABEDA_DATADOG_AGENT_PORT=8125
+# Logging severity threshold, you have to pass integer related to Logger Ruby class
+# has 1 value by default which is Logger::INFO
+YABEDA_DATADOG_LOG_LEVEL=1
 ```
 
 You can obtain your Datadog API keys in [Datadog dashboard](https://app.datadoghq.com/account/settings#api).
 
 Please note, when filling the queue (queue size option), your application will be blocked by waiting for a place in the queue.
 
-You may specify `DATADOG_AGENT_HOST` and/or `DATADOG_AGENT_PORT` environment variables if your Datadog agent is running not on the same host as an app/code that collects metrics.
+You may specify `YABEDA_DATADOG_AGENT_HOST` and/or `YABEDA_DATADOG_AGENT_PORT` environment variables if your Datadog agent is running not on the same host as an app/code that collects metrics.
 
 ### Start the adapter
 

data/examples/script.rb

@@ -12,12 +12,12 @@ yabeda_datadog = Yabeda::Datadog.start
 #   $ bin/dev
 #
 # To Use this script execute it directly with ruby command.
-# You have to provide DATADOG_API_KEY and DATADOG_APP_KEY
+# You have to provide YABEDA_DATADOG_API_KEY and YABEDA_DATADOG_APP_KEY
 # environment variables.
 #
 # Example:
 #
-#   DATADOG_API_KEY=<your API key> DATADOG_APP_KEY=<your app key> ruby examples/script.rb
+#   YABEDA_DATADOG_API_KEY=<your API key> YABEDA_DATADOG_APP_KEY=<your app key> ruby examples/script.rb
 #
 
 Yabeda.configure do

data/lib/yabeda/datadog/adapter.rb

@@ -14,7 +14,7 @@ module Yabeda
     # Sends yabeda metrics as custom metrics to DataDog.
     # https://docs.datadoghq.com/integrations/ruby/
     class Adapter < BaseAdapter
-      def initialize(worker: Worker.start)
+      def initialize(worker:)
         @worker = worker
       end
 
@@ -59,10 +59,12 @@ module Yabeda
       attr_reader :worker
 
       def enqueue_register(metric)
+        Logging.instance.debug("enqueue REGISTER action for metric #{metric.name}")
         worker.enqueue(:REGISTER, metric: metric)
       end
 
       def enqueue_send(metric, value, tags)
+        Logging.instance.debug("enqueue SEND action for metric #{metric.name}")
         worker.enqueue(:SEND, metric: metric, value: value, tags: tags)
       end
     end

data/lib/yabeda/datadog/config.rb

@@ -6,15 +6,16 @@ module Yabeda
   module Datadog
     # = Describes all config variables
     class Config < Anyway::Config
-      env_prefix :datadog
-      config_name :datadog
+      env_prefix :yabeda_datadog
+      config_name :yabeda_datadog
       attr_config :api_key,
                   :app_key,
                   agent_host: "localhost",
                   agent_port: 8125,
                   batch_size: 10,
                   queue_size: 1000,
-                  num_threads: 2
+                  num_threads: 2,
+                  log_level: Logger::INFO
     end
   end
 end

data/lib/yabeda/datadog/logging.rb

@@ -10,27 +10,29 @@ module Yabeda
       include Singleton
 
       def initialize
-        @logger = Logger.new(STDOUT)
+        @logger = Logger.new(STDOUT,
+                             level: Yabeda::Datadog.config.log_level,
+                             progname: "yabeda_datadog",)
       end
 
       def warn(message)
-        @logger.warn message
+        @logger.warn(message)
       end
 
       def info(message)
-        @logger.info message
+        @logger.info(message)
       end
 
       def debug(message)
-        @logger.debug message
+        @logger.debug(message)
       end
 
       def fatal(message)
-        @logger.fatal message
+        @logger.fatal(message)
       end
 
       def error(message)
-        @logger.error message
+        @logger.error(message)
       end
 
       def level=(level)

data/lib/yabeda/datadog/response_handler.rb

@@ -6,9 +6,9 @@ module Yabeda
     class ResponseHandler
       class << self
         def call(metric)
-          Logging.instance.info "Sending #{metric.name} metric"
+          Logging.instance.debug("sending #{metric.name} metric")
           response = yield
-          Logging.instance.info "Response on #{metric.name}: #{handle(response)}"
+          Logging.instance.debug("response on #{metric.name}: #{handle(response)}")
           response
         end
 

data/lib/yabeda/datadog/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Datadog
-    VERSION = "0.3.0.rc1"
+    VERSION = "0.3.0.rc2"
   end
 end

data/lib/yabeda/datadog/worker/register.rb

@@ -13,8 +13,8 @@ module Yabeda
             ResponseHandler.call(metric) do
               metric.update(dogapi)
             end
-          rescue StandardError => e
-            Logging.instance.fatal "Metric sending failed: #{e.message}"
+          rescue StandardError => err
+            Logging.instance.error("metric registration failed: #{err.message}")
           end
         end
       end

data/lib/yabeda/datadog/worker/send.rb

@@ -5,18 +5,23 @@ module Yabeda
     class Worker
       SEND = proc do |accumulated_payload|
         dogstatsd = ::Datadog::Statsd.new(
-          ENV.fetch("DATADOG_AGENT_HOST", Yabeda::Datadog.config.agent_host),
-          ENV.fetch("DATADOG_AGENT_PORT", Yabeda::Datadog.config.agent_port),
+          Yabeda::Datadog.config.agent_host,
+          Yabeda::Datadog.config.agent_port,
         )
 
-        dogstatsd.batch do |stats|
-          accumulated_payload.each do |payload|
-            metric = payload.fetch(:metric)
-            value = payload.fetch(:value)
-            tags = payload.fetch(:tags)
+        Logging.instance.debug("sending batch of #{accumulated_payload.size} metrics")
+        begin
+          dogstatsd.batch do |stats|
+            accumulated_payload.each do |payload|
+              metric = payload.fetch(:metric)
+              value = payload.fetch(:value)
+              tags = payload.fetch(:tags)
 
-            stats.send(metric.type, metric.name, value, tags: tags)
+              stats.send(metric.type, metric.name, value, tags: tags)
+            end
           end
+        rescue StandardError => err
+          Logging.instance.error("metric sending failed: #{err.message}")
         end
       end
     end

data/lib/yabeda/datadog/worker.rb

@@ -7,9 +7,14 @@ module Yabeda
   module Datadog
     # = Perform actions async
     class Worker
-      def self.start(queue_size: Yabeda::Datadog.config.queue_size)
-        instance = new(SizedQueue.new(queue_size))
-        instance.spawn_threads(Yabeda::Datadog.config.num_threads)
+      def self.start(config)
+        queue_size = config.queue_size
+        num_threads = config.num_threads
+        Logging.instance.info("start worker; queue size: #{queue_size}; threads #{num_threads} ")
+
+        queue = SizedQueue.new(queue_size)
+        instance = new(queue)
+        instance.spawn_threads(num_threads)
         instance
       end
 
@@ -19,7 +24,6 @@ module Yabeda
       end
 
       def enqueue(action, payload)
-        Logging.instance.info "enqueue action"
         queue.push([action, payload])
       end
 
@@ -66,6 +70,7 @@ module Yabeda
       end
 
       def stop
+        Logging.instance.info("stop worker")
         queue.close
         threads.each(&:exit)
         threads.clear

data/lib/yabeda/datadog.rb

@@ -19,12 +19,18 @@ module Yabeda
       @config ||= Config.new
     end
 
-    # Prepare the adapter to work
-    def self.start
+    # Check the gem configuration has valid state
+    def self.ensure_configured
       raise ApiKeyError unless config.api_key
       raise AppKeyError unless config.app_key
+    end
+
+    # Prepare the adapter to work
+    def self.start
+      ensure_configured
 
-      adapter = Yabeda::Datadog::Adapter.new
+      worker = Yabeda::Datadog::Worker.start(config)
+      adapter = Yabeda::Datadog::Adapter.new(worker: worker)
       Yabeda.register_adapter(:datadog, adapter)
       adapter
     end
@@ -32,11 +38,11 @@ module Yabeda
     # Start collection metrics from Yabeda collectors
     def self.start_exporter(collect_interval: COLLECT_INTERVAL)
       Thread.new do
-        Logging.instance.info "initilize collectors harvest"
+        Logging.instance.debug("initilize collectors harvest")
         loop do
-          Logging.instance.info "start collectors harvest"
+          Logging.instance.debug("start collectors harvest")
           Yabeda.collectors.each(&:call)
-          Logging.instance.info "end collectors harvest"
+          Logging.instance.debug("end collectors harvest")
           sleep(collect_interval)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-datadog
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc1
+  version: 0.3.0.rc2
 platform: ruby
 authors:
 - Dmitry Shvetsov <@shvetsovdm>