triglav-agent-bigquery 1.0.0.rc3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a96e14c9a56fc4252a422079d210232c95dff73
-  data.tar.gz: af517ecc9e6e4f1a5adc012447a21eebf0356811
+  metadata.gz: d7a186de9c6e0067a4d126a34bdc385d9530bd7a
+  data.tar.gz: 49a92bd870852241ee0bc1baab990c7129482cdf
 SHA512:
-  metadata.gz: 498f2afa7d336f4dce0dfe232e63a083e972a01394b292b0d5aaad4d0723e29c741cbf3c53f164b93026b40d514a97bd6bd450bd90eca64a6f1c1fcf8bc302a9
-  data.tar.gz: 7a63af2a83265c93ff12547f0d901805b2fc6f26e4c07754017873071be6dd0e37c5c2f4ec84059af981b6277829b8890cbb6f065473f25f7c97b8ea4746d81c
+  metadata.gz: 28fe97ff1a8b026615961347cb357c6e5622dbd8ea5fcb1bf61671fb61d2ab04b80b67e0461b9b45cd05b42649adf5d8fb346e7ddf5133f038d02add1e9901b9
+  data.tar.gz: b75ba41d1bdc5cc6d3e8fda6628336456d43b12b1335533e1377db4bf2b56730afedc27c3148c2aa55a70fef3f282c287e0ace7cb7b251cef73064bcc91b13bc

data/CHANGELOG.md

@@ -1,3 +1,3 @@
-# 1.0.0 (not released yet)
+# 1.0.0 (2017-04-14)
 
 initial version

data/example/config.yml

@@ -17,7 +17,8 @@ defaults: &defaults
   bigquery:
     monitor_interval: 5
     retries: 5
-    timeout_sec: 300
+    send_timeout_sec: 60
+    read_timeout_sec: 300
     open_timeout_sec: 300
     connection_info:
       "https://bigquery.cloud.google.com/table/<%= ENV['GOOGLE_PROJECT'] || 'your-project' %>":

data/lib/triglav/agent/bigquery/connection.rb

@@ -59,8 +59,13 @@ module Triglav::Agent
 
         client = Google::Apis::BigqueryV2::BigqueryService.new
         client.request_options.retries = retries
-        client.request_options.timeout_sec = timeout_sec
-        client.request_options.open_timeout_sec = open_timeout_sec
+        client.client_options.send_timeout_sec = send_timeout_sec
+        client.client_options.read_timeout_sec = read_timeout_sec
+        client.client_options.open_timeout_sec = open_timeout_sec
+
+        if timeout_sec
+          $logger.warn { "timeout_sec is depreacated. Use send_timeout_sec or read_timeout_sec instead" }
+        end
 
         scope = "https://www.googleapis.com/auth/bigquery"
 
@@ -267,8 +272,17 @@ module Triglav::Agent
         @retries ||= ENV['RETRIES'] || @connection_info.fetch(:retries, nil) || $setting.dig(:bigquery, :retries) || 5
       end
 
+      # For google-api-client < 0.11.0. Deprecated
       def timeout_sec
-        @timeout_sec ||= ENV['TIMEOUT_SEC'] || @connection_info.fetch(:timeout_sec, nil) || $setting.dig(:bigquery, :timeout_sec) || 300
+        @timeout_sec ||= ENV['TIMEOUT_SEC'] || @connection_info.fetch(:timeout_sec, nil) || $setting.dig(:bigquery, :timeout_sec)
+      end
+
+      def send_timeout_sec
+        @send_timeout_sec ||= ENV['SEND_TIMEOUT_SEC'] || @connection_info.fetch(:send_timeout_sec, nil) || $setting.dig(:bigquery, :send_timeout_sec) || 60
+      end
+
+      def read_timeout_sec
+        @read_timeout_sec ||= ENV['READ_TIMEOUT_SEC'] || @connection_info.fetch(:read_timeout_sec, nil) || $setting.dig(:bigquery, :read_timeout_sec) || timeout_sec || 300
       end
 
       def open_timeout_sec

data/lib/triglav/agent/bigquery/monitor.rb

@@ -67,7 +67,7 @@ module Triglav::Agent
       end
 
       def get_last_modified_times
-        last_modified_times = @status.get
+        last_modified_times = @status.get || {}
         max_last_modified_time = last_modified_times[:max] || @status.getsetnx([:max], $setting.debug? ? 0 : get_current_time)
         removes = last_modified_times.keys - tables.keys
         appends = tables.keys - last_modified_times.keys
@@ -96,9 +96,9 @@ module Triglav::Agent
       def self.resource_unit_valid?(resource)
         units = resource.unit.split(',').sort
         return false if units.size >= 2
-        if units.include?('hourly')
-          return false unless resource.uri.match(/%H/)
-        end
+        # if units.include?('hourly')
+        #   return false unless resource.uri.match(/%H/)
+        # end
         # if units.include?('daily')
         #   return false unless resource.uri.match(/%d/)
         # end
@@ -112,7 +112,7 @@ module Triglav::Agent
         return @dates if @dates
         now = Time.now.localtime(resource.timezone)
         @dates = resource.span_in_days.times.map do |i|
-          (now - (i * 86000)).to_date
+          (now - (i * 86400)).to_date
         end
       end
 
@@ -144,7 +144,7 @@ module Triglav::Agent
         return @dates if @dates
         now = Time.now.localtime(resource.timezone)
         @dates = resource.span_in_days.times.map do |i|
-          (now - (i * 86000)).to_date
+          (now - (i * 86400)).to_date
         end
       end
 

data/lib/triglav/agent/bigquery/version.rb

@@ -1,7 +1,7 @@
 module Triglav
   module Agent
     module Bigquery
-      VERSION = "1.0.0.rc3"
+      VERSION = "1.0.0"
     end
   end
 end

data/triglav-agent-bigquery.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "triglav-agent"
   spec.add_dependency "triglav_client"
-  spec.add_dependency "google-api-client"
+  spec.add_dependency "google-api-client", ">= 0.11.0"
   spec.add_dependency "ini_file"
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triglav-agent-bigquery
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors:
 - Triglav Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triglav-agent
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: ini_file
   requirement: !ruby/object:Gem::Requirement
@@ -194,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2