herdst_worker 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900944cbc8e142a33165f163ec11ca8feb5600ec273dd4682b4ae8b1981eb170
-  data.tar.gz: 65d027f53b6c501d2c392800cffa9e1a312dc3c75d44ccc611e3e747e5105d25
+  metadata.gz: 5c10aef4b5cddec70c9a214dd9525f907e9f1782efdd45df7b91f12224f958ce
+  data.tar.gz: 3f36164dfe5cdcda86b9b9d05fcca28deb7abf583384086b999fbd24dc7e680b
 SHA512:
-  metadata.gz: dbff474537dd0812301e7fc4f7f05d11f0946449b0c674c3e0d3b67befbbc90ac74bfb4bd426ace5d53824fa73222e422919ee9d6e388c19aaa026b96e531e81
-  data.tar.gz: e849b9fe1f607b88aeb11c1da0dc180ba2faecf966a9756509af264de369b2f906bd0e3db3e9dc3c780bbf5108753f0387ffef85224fdddd9e5ba7522f605c80
+  metadata.gz: 05b443e73d5d62a8a21586268f3ac66506953e82005c70dc0da2cd74e1eb9886a774e9c7d12e8bf6119303a3972864f0f666146e78c488c18ad6ee002029152e
+  data.tar.gz: ab82506161ffdd7f9fdbb632ab6c78f5c6d985514c688fbaea7036c0c62413c8668d11bbe27ee825ab0d724cda28190c39e2ccf91bf3521291feac4ce4fcfc62

data/lib/herdst_worker/adapters/database.rb

@@ -15,7 +15,7 @@ module HerdstWorker
                     db_config.each do |k, v|
                         db_config[k] = ActiveRecord::DatabaseConfigurations::HashConfig.new(app.config.env, k, v)
                     end
-                    
+
                     ActiveRecord::Base.configurations = db_config.values
                     ActiveRecord::Base.establish_connection(db_config[:primary])
                     ActiveRecord::Base.connection.enable_query_cache!

data/lib/herdst_worker/adapters/facade.rb

@@ -1,5 +1,3 @@
-require "sentry-raven"
-
 require_relative "database"
 require_relative "sentry"
 

data/lib/herdst_worker/adapters/sentry.rb

@@ -1,4 +1,5 @@
-require "sentry-raven"
+require "stackprof"
+require "sentry-ruby"
 
 
 module HerdstWorker
@@ -12,12 +13,20 @@ module HerdstWorker
                     release = app.config.metadata[:RELEASE_VERSION]
                     sentry_key = app.config.metadata[:SENTRY_KEY]
                     
-                    Raven.configure do |config|
-                        config.current_environment = environment
-                        config.release = release
-                        config.dsn = sentry_key if sentry_key
-                        config.environments = ["preview", "production"]
-                        config.async = lambda { |event| Thread.new { Raven.send_event(event) } }
+                    ::Sentry.init do |config|
+                        config.environment = environment
+                        config.dsn = sentry_key
+                        config.enabled_environments = %w[preview production]
+                        config.release = "#{environment}@#{release}"
+                        
+                        # Set traces_sample_rate to 1.0 to capture 100%
+                        # of transactions for performance monitoring.
+                        # We recommend adjusting this value in production.
+                        config.traces_sample_rate = 0.1
+                        # Set profiles_sample_rate to profile 100%
+                        # of sampled transactions.
+                        # We recommend adjusting this value in production.
+                        config.profiles_sample_rate = 0.1
                     end
                 rescue Exception => ex
                     app.logger.error ex.message
@@ -28,3 +37,39 @@ module HerdstWorker
         end
     end
 end
+
+
+
+
+
+
+# require "sentry-raven"
+
+
+# module HerdstWorker
+#     module Adapters
+#         class Sentry
+            
+            
+#             def self.setup(app)
+#                 begin
+#                     environment = app.config.metadata[:DEPLOYMENT_ENV]
+#                     release = app.config.metadata[:RELEASE_VERSION]
+#                     sentry_key = app.config.metadata[:SENTRY_KEY]
+                    
+#                     Raven.configure do |config|
+#                         config.current_environment = environment
+#                         config.release = release
+#                         config.dsn = sentry_key if sentry_key
+#                         config.environments = ["preview", "production"]
+#                         config.async = lambda { |event| Thread.new { Raven.send_event(event) } }
+#                     end
+#                 rescue Exception => ex
+#                     app.logger.error ex.message
+#                 end
+#             end
+            
+            
+#         end
+#     end
+# end

data/lib/herdst_worker/configuration/metadata.rb

@@ -10,7 +10,7 @@ module HerdstWorker
     
             
             attr_accessor :config, :aws_credentials, :secrets
-            attr_accessor :config_suffix, :secrets_suffix
+            attr_accessor :config_suffix, :secrets_suffix, :secret_json_keys
             
             
             def initialize(env, name, config)
@@ -20,7 +20,8 @@ module HerdstWorker
                 
                 self.secrets = {}.with_indifferent_access
                 self.secrets["ENV"] = env
-                
+                self.secret_json_keys = ["STRIPE_PLANS"]
+
                 begin
                     self.reload!
                 rescue Exception => ex
@@ -177,6 +178,14 @@ module HerdstWorker
                         values = self.config.config_for(:metadata)
                     end
                     
+                    if values && self.secret_json_keys
+                        self.secret_json_keys.each do |key|
+                            if values[key] && values[key].is_a?(String)
+                                values[key] = JSON.parse(values[key]) rescue nil
+                            end
+                        end
+                    end
+                    
                     values.each { |k, v| self[k] = v } if values
                 end
             

data/lib/herdst_worker/queue/facade.rb

@@ -92,7 +92,7 @@ module HerdstWorker
             
             
             def create_email_queue_message(template, company, message_data, attributes = nil, delay = 2)
-                company_key = company.class.name.downcase.to_sym
+                company_key = company.class.name.downcase.to_sym rescue "company"
                 
                 # Convert instances of ApplicationRecord to attributes instead of json representation
                 message_data.each do |key, value|

data/lib/herdst_worker/queue/processor.rb

@@ -168,7 +168,7 @@ module HerdstWorker
                     }.rescue { |ex|
                         if will_fail_permanently
                             self.app.logger.queue.error "Message failed #{attempt_number} times, Reporting and failing permanently. \n#{ex.to_s} \n#{ex.backtrace.join("\n")}"
-                            Raven.capture_exception(ex, {
+                            Sentry.capture_exception(ex, {
                                 :level => "fatal",
                                 :extra => {
                                     "queue_attempts" => attempt_number,

data/lib/herdst_worker/queue/runner.rb

@@ -128,7 +128,7 @@ module HerdstWorker
                     if self.app.config.is_dev?
                         raise message
                     else
-                        Raven.capture_message(message)
+                        Sentry.capture_message(message)
                         return
                     end
                 end

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.8'
+  VERSION = '0.2.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Herd.St
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,25 +147,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.80'
 - !ruby/object:Gem::Dependency
-  name: sentry-raven
+  name: stackprof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 0.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: sentry-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 5.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 5.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement