bricolage-streamingload 0.16.0 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e799760fb58dd3ec1dcd3eeaf74b068a0336a21a32488f04dc0353d44514c0cd
-  data.tar.gz: 1ec9bfe0cadd6537a352e99cf7b61d53122ae17a67dd31c733e4e2e0c7890849
+  metadata.gz: 156e42da1bd9a51564c4648b497997ae96c5a9211b0716506f7781cb2ca6e572
+  data.tar.gz: facff01968de8a74e9164c314fc2c540eb36ea20092f9db56748b1493f1bc1ea
 SHA512:
-  metadata.gz: 700157b7be5a53753056d7a830d5502c117cbcae474a97be17a72cb18b58a8aa48ea927aaf333040e6674c098413e91298a6bfe112b1fcd58293d32c4b207068
-  data.tar.gz: bb63e1c5e7f646003ed07c0f12758cb79bd316227033d43ae2cb0165a203d3706bfdf6ea2eae8ef681e8d9c02285fcca5a98ab4f8d7b0c3a78ab3a11b853fe31
+  metadata.gz: 906915bf0cf9ff63bbb9a048d21b42e51059665643b8a34cf5c51751fa2b708b083e5ab061c7c3cb7d56b5457f04b9479e66ae3320e9df175070ffbdb04d7399
+  data.tar.gz: 7583875fa978f25c420cb8ff9732ff3d73553af3157d72115581fe4ef09ef11b40c90b64041158ff147eee8adad29e2ebc56d83b9755323a3b414065cadab466

data/Gemfile.lock

@@ -1,44 +1,51 @@
 PATH
   remote: .
   specs:
-    bricolage-streamingload (0.15.2)
+    bricolage-streamingload (0.16.1)
       aws-sdk-s3 (~> 1.8)
       aws-sdk-sqs (~> 1.3)
-      bricolage (>= 5.29.2)
+      bricolage (~> 5.30)
       pg (~> 0.18.0)
+      sentry-raven (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.1)
-    aws-partitions (1.102.0)
-    aws-sdk-core (3.25.0)
-      aws-eventstream (~> 1.0)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.351.0)
+    aws-sdk-core (3.104.3)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.7.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.17.1)
-      aws-sdk-core (~> 3, >= 3.21.2)
+    aws-sdk-kms (1.36.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.75.0)
+      aws-sdk-core (~> 3, >= 3.104.1)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-sns (1.3.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-sqs (1.4.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
-    bricolage (5.29.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.28.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    bricolage (5.30.0)
       aws-sdk-s3 (~> 1)
       aws-sdk-sns (~> 1)
       pg (~> 0.18.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
     jmespath (1.4.0)
+    multipart-post (2.1.1)
     pg (0.18.4)
     power_assert (1.1.3)
-    rake (12.3.1)
+    rake (12.3.3)
+    sentry-raven (3.0.0)
+      faraday (>= 1.0)
     test-unit (3.2.8)
       power_assert
 
@@ -51,4 +58,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/RELEASE.md

@@ -1,5 +1,21 @@
 # Bricolage Streaming Load Release Note
 
+## version 0.17.2
+
+- [fix] Relax dependency gem versions
+
+## version 0.17.1
+
+- [new][tmp] Sends a message to Sentry on start-up.
+
+## version 0.17.0
+
+- [new] Introduces Sentry error reporting.  Define SENTRY_DSN environment variable to enable it.
+
+## version 0.16.1
+
+- [fix] Stop retrying after 2 times retried (total 3 trial).
+
 ## version 0.16.0
 
 - [new] Retry for also error tasks, not only failure tasks.

data/bricolage-streamingload.gemspec

@@ -17,10 +17,9 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.required_ruby_version = '>= 2.3.0'
-  s.add_dependency 'bricolage', '>= 5.29.2'
-  s.add_dependency 'pg', '~> 0.18.0'
-  s.add_dependency 'aws-sdk-s3', '~> 1.8'
+  s.add_dependency 'bricolage', '>= 5.30.0', '< 6.0.0'
   s.add_dependency 'aws-sdk-sqs', '~> 1.3'
+  s.add_dependency 'sentry-raven', '~> 3.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
 end

data/lib/bricolage/streamingload/dispatcher.rb

@@ -10,8 +10,9 @@ require 'bricolage/streamingload/chunkbuffer'
 require 'bricolage/streamingload/loadtasklogger'
 require 'bricolage/streamingload/alertinglogger'
 require 'yaml'
-require 'optparse'
 require 'fileutils'
+require 'raven'
+require 'optparse'
 
 module Bricolage
 
@@ -20,6 +21,13 @@ module Bricolage
     class Dispatcher < SQSDataSource::MessageHandler
 
       def Dispatcher.main
+        Raven.capture_message("dispatcher start")
+        Raven.capture {
+          _main
+        }
+      end
+
+      def Dispatcher._main
         opts = DispatcherOptions.new(ARGV)
         opts.parse
         unless opts.rest_arguments.size == 1

data/lib/bricolage/streamingload/job.rb

@@ -3,6 +3,7 @@ require 'bricolage/streamingload/manifest'
 require 'bricolage/sqlutils'
 require 'socket'
 require 'json'
+require 'raven'
 
 module Bricolage
 
@@ -44,7 +45,8 @@ module Bricolage
       def execute(fail_fast: false)
         execute_task
         return true
-      rescue JobCancelled
+      rescue JobCancelled => ex
+        Raven.capture_exception(ex)
         return true
       rescue JobDuplicated
         return true
@@ -52,20 +54,25 @@ module Bricolage
         return false
       rescue ControlConnectionFailed => ex
         @logger.error ex.message
+        Raven.capture_exception(ex)
         wait_for_connection('ctl', @ctl_ds) unless fail_fast
         return false
       rescue DataConnectionFailed => ex
         @logger.error ex.message
+        Raven.capture_exception(ex)
         wait_for_connection('data', @data_ds) unless fail_fast
         return false
       rescue JobFailure => ex
         @logger.error ex.message
+        Raven.capture_exception(ex)
         return false
       rescue JobError => ex
         @logger.error ex.message
+        Raven.capture_exception(ex)
         return false
       rescue Exception => ex
         @logger.exception ex
+        Raven.capture_exception(ex)
         return true
       end
 
@@ -126,7 +133,11 @@ module Bricolage
           raise
         rescue JobError => ex
           ctl.open {
-            ctl.abort_job job_id, 'error', ex.message.lines.first.strip
+            fail_count = @task.failure_count
+            final_retry = (fail_count >= MAX_RETRY)
+            retry_msg = (fail_count > 0) ? "(retry\##{fail_count}#{final_retry ? ' FINAL' : ''}) " : ''
+            ctl.abort_job job_id, 'error', retry_msg + ex.message.lines.first.strip
+            raise JobCancelled, "retry count exceeds limit: task_id=#{@task_id}" if final_retry
           }
           raise
         rescue Exception => ex

data/lib/bricolage/streamingload/taskhandler.rb

@@ -7,6 +7,7 @@ require 'bricolage/logger'
 require 'bricolage/exception'
 require 'bricolage/version'
 require 'yaml'
+require 'raven'
 require 'optparse'
 
 module Bricolage
@@ -16,6 +17,8 @@ module Bricolage
     class TaskHandler < SQSDataSource::MessageHandler
 
       def TaskHandler.main
+        Raven.capture_message("loader start")
+
         opts = TaskHandlerOptions.new(ARGV)
         opts.parse
         unless opts.rest_arguments.size <= 1

data/lib/bricolage/streamingload/version.rb

@@ -1,5 +1,5 @@
 module Bricolage
   module StreamingLoad
-    VERSION = '0.16.0'
+    VERSION = '0.17.2'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bricolage-streamingload
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.2
 platform: ruby
 authors:
 - Minero Aoki
 - Shimpei Kodama
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bricolage
@@ -17,56 +17,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.29.2
+        version: 5.30.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.29.2
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 5.30.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-sqs
+  name: sentry-raven
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +152,7 @@ homepage: https://github.com/aamine/bricolage-streamingload
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Bricolage Streaming Load Daemon
 test_files: []