airship-ruby 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc2837e7860439e13430504df151ad1c65ff14f773d6a5cd8b9769bb72f7d878
-  data.tar.gz: 1829c67d1db585fee1b42270333a45a89cc2d4cb1d6c89cc8f9d661247266e3a
+  metadata.gz: 3d59b238a7a3c148f227bf5cee84afdea2b05d503cc4c09cb32099cedb2f124a
+  data.tar.gz: 8995be1f77fa3c2b4bb28ab3e0b59c398e4b93aa42c2e06105c5c6e5c49b40ad
 SHA512:
-  metadata.gz: 26681353e4fabc3e58323cc15f7b6746b049d15287aeca26c614edce6b966f7a7c80f464f8fff713fc840054ab22a0fda61e93875f29850b8d0e0509a74c272f
-  data.tar.gz: 1dc98c73102a028a5a07a406a00909adaf613b411953f3c7d332aa4fc52d3bc6619043910ba42949cac557790d0d51b1ae8dc77f60482cca4e2694c4d8e0daec
+  metadata.gz: 1aa178627ab85311d5526a4fe04c73af313f12fb3c77792caa20d7b59d76898bf846426e2ac125e7abf132c2c879a2d1eba3ff6c9fd7cb60ff6bf4de7df9aace
+  data.tar.gz: 1c6f2fa64fb2833b3a6cea08ece255cc02bbe5e88c66fb62a6a07298c18c8074a32a3513e4436350481f3f10570f3e9e11827af736a48185a7c14a49bb20559e

data/airship-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "airship-ruby"
-  s.version     = "1.1.9"
+  s.version     = "1.1.10"
   s.licenses    = ["MIT"]
   s.summary     = "Airship Ruby SDK"
   s.description = "Ruby SDK"
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.files       = ["lib/airship-ruby.rb", "airship-ruby.gemspec"]
   s.homepage    = "https://airshiphq.com"
   s.metadata    = { "source_code_uri" => "https://github.com/airshiphq/airship-ruby" }
-  s.add_runtime_dependency "faraday", ">= 0.9.0"
-  s.add_runtime_dependency "json", ">= 1.8.2"
-  s.add_runtime_dependency "concurrent-ruby", ">= 1.0.3"
-  s.add_runtime_dependency "json-schema", ">= 2.5.0"
+  s.add_runtime_dependency "faraday", "~> 0.9", ">= 0.9.0"
+  s.add_runtime_dependency "json", "~> 1.8", ">= 1.8.2"
+  s.add_runtime_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.3"
+  s.add_runtime_dependency "json-schema", "~> 2.5", ">= 2.5.0"
 end

data/lib/airship-ruby.rb

@@ -160,56 +160,44 @@ class Airship
   end
 
   def initialize(options)
-
     @api_key = options[:api_key]
     @env_key = options[:env_key]
+    @timeout = 10
 
-    if @api_key.nil?
-      raise Exception.new('Missing api_key')
-    end
+    @polling_interval = 60
+    @ingestion_interval = 60
 
-    if @env_key.nil?
-      raise Exception.new('Missing env_key')
-    end
+    @polling_thread = nil
+    @ingestion_thread = nil
 
     @gating_info = nil
-    @gating_info_downloader_task = nil
-    @gating_info_polling_interval = 60
-
     @gating_info_map = nil
 
-    @max_gate_stats_batch_size = 500
-    @gate_stats_upload_batch_interval = 60
+    @last_ingestion_timestamp = 0
+    @ingestion_tasks = []
 
-    @gate_stats_watcher = nil
-    @gate_stats_last_task_scheduled_timestamp = 0
+    @ingestion_batch = []
+    @ingestion_max_batch_size = 500
 
-    @gate_stats_uploader_tasks = []
+    @init_lock = Concurrent::Semaphore.new(1)
+    @ingestion_batch_lock = Concurrent::Semaphore.new(1)
 
-    @gate_stats_batch = []
-
-    @initialization_lock = Concurrent::Semaphore.new(1)
-    @gate_stats_batch_lock = Concurrent::Semaphore.new(1)
-
-    @first_gate = true
+    @first_ingestion = true
   end
 
   def init
-    @initialization_lock.acquire
-    if @gating_info_downloader_task.nil?
+    @init_lock.acquire
+    if @polling_thread.nil?
       self._poll
-      if @gating_info.nil?
-        puts 'Failed to connect to Airship server'
-      end
-      @gating_info_downloader_task = self._create_poller
-      @gating_info_downloader_task.execute
+      @polling_thread = self._create_poller
+      @polling_thread.execute
     end
 
-    if @gate_stats_watcher.nil?
-      @gate_stats_watcher = self._create_watcher
-      @gate_stats_watcher.execute
+    if @ingestion_thread.nil?
+      @ingestion_thread = self._create_ingestor
+      @ingestion_thread.execute
     end
-    @initialization_lock.release
+    @init_lock.release
     self
   end
 
@@ -271,7 +259,7 @@ class Airship
 
       object['stats'] = stats
 
-      self._upload_stats_async(object)
+      self._ingest_async(object)
     end
 
     return is_enabled
@@ -335,7 +323,7 @@ class Airship
 
       object['stats'] = stats
 
-      self._upload_stats_async(object)
+      self._ingest_async(object)
     end
 
     return variation
@@ -399,7 +387,7 @@ class Airship
 
       object['stats'] = stats
 
-      self._upload_stats_async(object)
+      self._ingest_async(object)
     end
 
     return is_eligible
@@ -460,53 +448,66 @@ class Airship
     begin
       conn = Faraday.new(url: "#{GATING_INFO_ENDPOINT}/#{@env_key}")
       response = conn.get do |req|
-        req.options.timeout = 10
+        req.options.timeout = @timeout
         req.headers['api-key'] = @api_key
       end
       if response.status == 200
         gating_info = JSON.parse(response.body)
 
         if gating_info['server_info'] == 'maintenance'
+          puts 'Airship is currently going through maintenance'
           return
         end
 
         gating_info_map = self._get_gating_info_map(gating_info)
         @gating_info = gating_info
         @gating_info_map = gating_info_map
+
+        if !gating_info['polling_interval'].nil?
+          self.polling_interval = gating_info['polling_interval']
+        end
+
+        if !gating_info['ingestion_interval'].nil?
+          self.ingestion_interval = gating_info['ingestion_interval']
+        end
+      else
+        puts 'Failed to connect to Airship server'
       end
     rescue Exception => e
-      puts 'Failed to poll'
+      puts 'Failed to connect to Airship server'
     end
   end
 
   def _create_poller
-    Concurrent::TimerTask.new(execution_interval: @gating_info_polling_interval, timeout_interval: 10) do |task|
+    Concurrent::TimerTask.new(execution_interval: @polling_interval, timeout_interval: @timeout) do |task|
       self._poll
+      task.execution_interval = @polling_interval
     end
   end
 
-  def _create_watcher
-    Concurrent::TimerTask.new(execution_interval: @gate_stats_upload_batch_interval, timeout_interval: 10) do |task|
+  def _create_ingestor
+    Concurrent::TimerTask.new(execution_interval: @ingestion_interval, timeout_interval: @timeout) do |task|
       now = Time.now.utc.to_i
-      if now - @gate_stats_last_task_scheduled_timestamp >= @gate_stats_upload_batch_interval
+      if now - @last_ingestion_timestamp >= @ingestion_interval
         processed = self._process_batch(0)
         if processed
-          @gate_stats_last_task_scheduled_timestamp = now
+          @last_ingestion_timestamp = now
         end
       end
+      task.execution_interval = @ingestion_interval
     end
   end
 
-  def _create_processor(batch)
+  def _create_processor(payload)
     return Concurrent::ScheduledTask.execute(0) do |task|
       conn = Faraday.new(url: IDENTIFY_ENDPOINT)
       response = conn.post do |req|
-        req.options.timeout = 10
+        req.options.timeout = @timeout
         req.headers['Content-Type'] = 'application/json'
         req.headers['api-key'] = @api_key
         req.body = JSON.generate({
           'env_key' => @env_key,
-          'objects' => batch,
+          'objects' => payload,
         })
       end
     end
@@ -521,33 +522,33 @@ class Airship
     # is performed.
 
     processed = false
-    @gate_stats_batch_lock.acquire
+    @ingestion_batch_lock.acquire
     if !gate_stats.nil?
-      @gate_stats_batch.push(gate_stats)
+      @ingestion_batch.push(gate_stats)
     end
-    if @gate_stats_batch.size > limit || (@first_gate && @gate_stats_batch.size > 0)
-      @first_gate = false
-      new_gate_stats_uploader_tasks = []
-      @gate_stats_uploader_tasks.each do |task|
+    if @ingestion_batch.size > limit || (@first_ingestion && @ingestion_batch.size > 0)
+      @first_ingestion = false
+      new_ingestion_tasks = []
+      @ingestion_tasks.each do |task|
         if !task.fulfilled?
-          new_gate_stats_uploader_tasks.push(task)
+          new_ingestion_tasks.push(task)
         end
       end
-      old_batch = @gate_stats_batch
-      @gate_stats_batch = []
-      new_gate_stats_uploader_tasks.push(self._create_processor(old_batch))
-      @gate_stats_uploader_tasks = new_gate_stats_uploader_tasks
+      payload = @ingestion_batch
+      @ingestion_batch = []
+      new_ingestion_tasks.push(self._create_processor(payload))
+      @ingestion_tasks = new_ingestion_tasks
       processed = true
     end
-    @gate_stats_batch_lock.release
+    @ingestion_batch_lock.release
     processed
   end
 
-  def _upload_stats_async(gate_stats)
-    processed = self._process_batch(@max_gate_stats_batch_size - 1, gate_stats)
+  def _ingest_async(gate_stats)
+    processed = self._process_batch(@ingestion_max_batch_size - 1, gate_stats)
     if processed
       now = Time.now.utc.to_i
-      @gate_stats_last_task_scheduled_timestamp = now
+      @last_ingestion_timestamp = now
     end
   end
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: airship-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Airship Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
@@ -28,6 +34,9 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
@@ -42,6 +54,9 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
@@ -49,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
@@ -56,6 +74,9 @@ dependencies:
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0
@@ -63,6 +84,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0