datadog_proxy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f1f0b5b195dceb4d7654d6e89464a30511b001
-  data.tar.gz: 9fa3cb4d71bc6c6e0ebef24a574cb7bb251cb2f0
+  metadata.gz: d3eb27154e8cc8f437356761bcd3b4ead2f4662c
+  data.tar.gz: fe6c1e54b4decfadd4eddb5c6b612486d996d419
 SHA512:
-  metadata.gz: 57b93293e11f86a679a7e9fc59e4dc4ee4e80851bec2fa76cf475fcf75fd5d829c3b0b06539439cfe134479cdb577f49ee39586b94e9b8183cf11f1bad4e596c
-  data.tar.gz: 362e0b215762e8208494fd477ccd562b8f51b5d8e52701f408c84678240684d2414ff451c1145f972eca7b29ca5830b60279c9759dae28a8aee1aec7a2097165
+  metadata.gz: 9727e86e1191f043f8bd59ab69427442b013ad973521f06aea83c9b68b92d1812a97d380a8c8e515f3b8e30563918322bd9ac53b19ec6358ed6568ea24ec5795
+  data.tar.gz: fc8064c5c1dd47c182619fe5229d30f8ef136764aae823f30c536ce3c32032f52f7ed1cd0c669baadc4cb2af22b4fdbf54adf62eba92294c41ea9e9f2923ad64

data/datadog_proxy.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra', '~> 1.4.5'
   spec.add_dependency 'dogapi', '~> 1.10.0'
   spec.add_dependency 'dotenv', '~> 0.11.1'
+  spec.add_dependency 'chronic', '~> 0.10.2'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/datadog_proxy/app.rb

@@ -1,14 +1,16 @@
 require 'datadog_proxy'
 require 'sinatra'
+require 'chronic'
 
 module DatadogProxy
   class App < Sinatra::Application
+    class Error < StandardError; end
+
     def initialize(*args)
       super(*args)
     end
 
     def client
-      p :hello
       @_client ||= DatadogClient.new(ENV['DATADOG_API_KEY'], ENV['DATADOG_APP_KEY'])
     end
 
@@ -28,14 +30,25 @@ module DatadogProxy
     get '/graphs/snapshot' do
       options = {}
       options[:query] = params[:query]
-      options[:start] = Time.at(params[:start].to_i) if params[:start]
-      options[:end] = Time.at(params[:end].to_i) if params[:end]
+      options[:start] = _parse_time(params[:start]) if params[:start]
+      options[:end] = _parse_time(params[:end]) if params[:end]
       options[:duration] = params[:duration].to_i if params[:duration]
-
+p options
       url = client.graph_snapshot_url(options)
 
       redirect url, 302
     end
+
+    private
+    def _parse_time(str)
+      if /^\d+$/ =~ str
+        Time.at(str.to_i)
+      else
+        time = Chronic.parse(str)
+        return time if time
+        raise Error, "Cannot parse time (#{str})"
+      end
+    end
   end
 end
 

data/lib/datadog_proxy/datadog_client.rb

@@ -1,5 +1,7 @@
 require 'datadog_proxy'
 require 'dogapi'
+require 'timeout'
+require 'net/https'
 
 module DatadogProxy
   class DatadogClient
@@ -7,15 +9,10 @@ module DatadogProxy
 
     def initialize(api_key, app_key)
       @client = Dogapi::Client.new(api_key, app_key)
-      @graph_snapshot_url_cache = {}
     end
 
     def graph_snapshot_url(options)
-      # TODO: cap cache size or use external storage like memcached
-      @graph_snapshot_url_cache[options.hash] ||= _graph_snapshot_url(options)
-
-      # Append time to avoid the graph is cached.
-      "#{@graph_snapshot_url_cache[options.hash]}?#{Time.now.to_i}"
+      _graph_snapshot_url(options)
     end
 
     private
@@ -47,7 +44,28 @@ module DatadogProxy
         raise Error, "Failed to get a snapshot."
       end
 
-      response[1]['snapshot_url']
+      snapshot_url = response[1]['snapshot_url']
+      timeout(10) do
+        _wait_for_generating(snapshot_url)
+      end
+
+      snapshot_url
+    end
+
+    def _wait_for_generating(url)
+      while true
+        uri = URI.parse(url)
+        req = Net::HTTP::Head.new(uri.path)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        res = http.start do
+          http.request(req)
+        end
+        if res.code == '200' && res["Content-Length"].to_i > 1024
+          return
+        end
+        sleep 1
+      end
     end
   end
 end

data/lib/datadog_proxy/version.rb

@@ -1,3 +1,3 @@
 module DatadogProxy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryota Arai
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement