rails-cloud-tasks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924a936920255b90f05426a1a02d8fcb7c0b688f05ecf23f47d5574cfd830100
-  data.tar.gz: dac09c6a8c32a41ce9b8849b57892cac630f54b9592faf88400d248ac32d4661
+  metadata.gz: 5059f50ae4598ee23d9abec5ddac5eb2e1c8d4a2023ff794b08461b8611d6d73
+  data.tar.gz: 15cb24ec98ffde490596bbdb0a1dff7145e98dcf15aadfb4a5c12093dd8dbfba
 SHA512:
-  metadata.gz: b4bb22ec37af949357f944d2e5dc5f80c955fd65426aadc35f1ac4d7bc53cfdc8d5703813553f824e2024c137087a3d891f16d2a7859eb6a26fef771da7a894f
-  data.tar.gz: 4ca848172ca6473f08348f0b5ff6d9f9ddad8ff2a9b95ab9b2f8e77d933c5d6a1ebd4c29b1eac6afa43ecd3e665913fb9864d22bc8b451a1ee946b1279be6cb4
+  metadata.gz: c9076b550dfbdbb3909633ee5f262613df39efc844d06d4a6c6e9153863b18480dc70405c728999465298a7b3950a29454db4f7c5bef926b5d2330cefc7e840d
+  data.tar.gz: cab15a28e2083170c65643b7ae58bd83ac2a359b767a3bfa138d6ffc32021767c526dafe4fbf1edc3f0a53b4714ffde19d4128b95081563a70c705e7ac6bd813

data/.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
       pre_release: ${{ steps.versioning.outputs.pre_release }}
       upgraded: ${{ steps.versioning.outputs.upgraded }}
       package_version: ${{ steps.versioning.outputs.package_version }}
+      release_message: ${{ steps.versioning.outputs.release_message }}
     steps:
       - uses: actions/checkout@v2
 
@@ -30,7 +31,9 @@ jobs:
           key: ${{ runner.os }}-gem-${{ hashFiles('**/rails-cloud-tasks.gemspec') }}-2.7
 
       - name: Install dependencies
-        run: bundle install
+        run: |
+          bundle config set without 'development test'
+          bundle install
 
       - name: Fetching Tags
         run: git fetch -t
@@ -45,6 +48,8 @@ jobs:
           echo "::set-output name=upgraded::"$upgraded
           pre_release=$([[ $package_version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "false" || echo "true")
           echo "::set-output name=pre_release::"$pre_release
+          release_message=$(git log HEAD ^$(git describe --tags `git rev-list --tags --max-count=1`) --pretty=format:'* %C(green)%h%C(reset) %s')
+          echo "::set-output name=release_message::"$release_message
 
   release:
     runs-on: ubuntu-latest
@@ -68,7 +73,9 @@ jobs:
           key: ${{ runner.os }}-gem-${{ hashFiles('**/rails-cloud-tasks.gemspec') }}-2.7
 
       - name: Install dependencies
-        run: bundle install
+        run: |
+          bundle config set without 'development test'
+          bundle install
 
       - name: Create Release
         uses: actions/create-release@v1
@@ -78,8 +85,7 @@ jobs:
           tag_name: ${{ needs.checks.outputs.package_version }}
           release_name: Release ${{ needs.checks.outputs.package_version }}
           body: |
-            Auto-released by bot.
-            See commit changes.
+            ${{ needs.checks.outputs.release_message }}
           draft: false
           prerelease: ${{ needs.checks.outputs.pre_release }}
 

data/README.md

@@ -64,6 +64,14 @@ Check out the available configs and its usage description:
 | tasks_path            	| The path to run tasks                                                                                       	| 𐄂                   	|                    	| '/tasks'                 	|
 
 
+- Configure ActiveJob queue_adapter
+
+```ruby
+# ./config/application.rb
+
+config.active_job.queue_adapter = RailsCloudTasks.queue_adapter
+```
+
 - Add a Job class:
 ```ruby
 # ./app/jobs/application_job.rb

data/lib/rails-cloud-tasks.rb

@@ -12,6 +12,7 @@ module RailsCloudTasks
   autoload :AppEngine
   autoload :Configuration
   autoload :Version
+  autoload :Instrumentation
 
   module Rack
     extend ActiveSupport::Autoload
@@ -39,4 +40,21 @@ module RailsCloudTasks
       end
     end
   end
+
+  @queue_adapter = nil
+
+  def queue_adapter
+    @@queue_adapter
+  end
+
+  def self.queue_adapter
+    @queue_adapter ||= Adapter.new
+  rescue StandardError => e
+    raise e unless Rails.env.development?
+
+    logger.warn('unable to setup adapter, falling back to :inline')
+    logger.warn(e)
+
+    :inline
+  end
 end

data/lib/rails_cloud_tasks/instrumentation.rb

@@ -0,0 +1,19 @@
+module RailsCloudTasks
+  module Instrumentation
+    extend ActiveSupport::Autoload
+
+    autoload :Default
+    autoload :Factory
+    autoload :NewRelic
+
+    module_function
+
+    def agent
+      @agent ||= RailsCloudTasks::Instrumentation::Factory.agent_class.new
+    end
+
+    def transaction_name!(*opts)
+      agent.transaction_name!(opts)
+    end
+  end
+end

data/lib/rails_cloud_tasks/instrumentation/default.rb

@@ -0,0 +1,7 @@
+module RailsCloudTasks
+  module Instrumentation
+    class Default
+      def transaction_name!(*opts); end
+    end
+  end
+end

data/lib/rails_cloud_tasks/instrumentation/factory.rb

@@ -0,0 +1,11 @@
+module RailsCloudTasks
+  module Instrumentation
+    class Factory
+      def self.agent_class
+        return NewRelic if defined?(::NewRelic)
+
+        Default
+      end
+    end
+  end
+end

data/lib/rails_cloud_tasks/instrumentation/new_relic.rb

@@ -0,0 +1,13 @@
+module RailsCloudTasks
+  module Instrumentation
+    class NewRelic
+      def transaction_name!(opts)
+        agent.set_transaction_name(*opts)
+      end
+
+      def agent
+        @agent ||= ::NewRelic::Agent
+      end
+    end
+  end
+end

data/lib/rails_cloud_tasks/rack/jobs.rb

@@ -8,6 +8,10 @@ module RailsCloudTasks
         def call(env)
           job_class = extract_job_class(env)
 
+          RailsCloudTasks::Instrumentation.transaction_name!(
+            "RailsCloudTasks/#{job_class}/perform_now"
+          )
+
           request = ::Rack::Request.new(env)
           job_args = extract_args(request)
           job_class.perform_now(job_args)

data/lib/rails_cloud_tasks/rack/tasks.rb

@@ -9,8 +9,11 @@ module RailsCloudTasks
           request = ::Rack::Request.new(env)
           job = extract_job(request)
 
-          ActiveJob::Base.execute(job)
+          RailsCloudTasks::Instrumentation.transaction_name!(
+            "RailsCloudTasks/#{job['job_class']}/perform_now"
+          )
 
+          ActiveJob::Base.execute(job)
           response(200, {})
         rescue Rack::InvalidPayloadError => e
           response(400, { error: e.cause.message })

data/lib/rails_cloud_tasks/scheduler.rb

@@ -4,28 +4,36 @@ module RailsCloudTasks
              :scheduler_file_path, :scheduler_prefix_name,
              :service_account_email, to: 'RailsCloudTasks.config'
 
-    attr_reader :client, :credentials
+    attr_reader :client, :credentials, :logger
 
     def initialize(
       client: Google::Cloud::Scheduler.cloud_scheduler,
-      credentials: RailsCloudTasks::Credentials.new
+      credentials: RailsCloudTasks::Credentials.new,
+      logger: RailsCloudTasks.logger
     )
       client.configure do |config|
         config.credentials = credentials.generate(service_account_email)
       end
       @client = client
+      @logger = logger
     end
 
     # Create & Update scheduler job on Google Cloud
     # TODO: Support to delete scheduled jobs
     def upsert
+      result = { success: [], failure: [] }
       scheduler_jobs.each do |job|
+        success = true
         begin
           client.create_job parent: location_path, job: job
         rescue Google::Cloud::AlreadyExistsError
           client.update_job job: job
+        rescue StandardError
+          success = false
         end
+        success ? (result[:success] << job[:name]) : (result[:failure] << job[:name])
       end
+      log_output(result)
     end
 
     protected
@@ -58,5 +66,23 @@ module RailsCloudTasks
     rescue Errno::ENOENT
       []
     end
+
+    def log_output(result)
+      parse_task_name = ->(task) { task.split("#{scheduler_prefix_name}--")[1] }
+      success = result[:success].map(&parse_task_name)
+      failure = result[:failure].map(&parse_task_name)
+
+      if success.count.positive?
+        log("Successfuly scheduled #{success.count} tasks", '- [✓] ',
+            success)
+      end
+
+      log("Failed to schedule #{failure.count} tasks", '- [𐄂] ', failure) if failure.count.positive?
+    end
+
+    def log(desc, prefix, tasks)
+      logger.info(desc)
+      logger.info(prefix + tasks.join("\n #{prefix}"))
+    end
   end
 end

data/lib/rails_cloud_tasks/version.rb

@@ -1,3 +1,3 @@
 module RailsCloudTasks
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/rails-cloud-tasks.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-apis-iamcredentials_v1'
   spec.add_dependency 'google-cloud-scheduler', '>= 2'
   spec.add_dependency 'google-cloud-tasks', '>= 2'
-  spec.add_development_dependency 'rails', '>= 4'
+  spec.add_dependency 'rails', '>= 4'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-cloud-tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Guilherme Araújo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -284,6 +284,10 @@ files:
 - lib/rails_cloud_tasks/app_engine.rb
 - lib/rails_cloud_tasks/configuration.rb
 - lib/rails_cloud_tasks/credentials.rb
+- lib/rails_cloud_tasks/instrumentation.rb
+- lib/rails_cloud_tasks/instrumentation/default.rb
+- lib/rails_cloud_tasks/instrumentation/factory.rb
+- lib/rails_cloud_tasks/instrumentation/new_relic.rb
 - lib/rails_cloud_tasks/rack/errors.rb
 - lib/rails_cloud_tasks/rack/jobs.rb
 - lib/rails_cloud_tasks/rack/tasks.rb
@@ -292,6 +296,7 @@ files:
 - lib/railtie.rb
 - lib/tasks/scheduler.rake
 - rails-cloud-tasks.gemspec
+- renovate.json
 homepage: http://github.com/flamingo-run/rails-cloud-tasks
 licenses:
 - Apache License 2.0