neetodeploy-autoscale 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac41afdf5167983ced54868a0c75d2e909e713b5a540d90373f9433336c5bb7
-  data.tar.gz: e806a42f873bb3e8c40e63db076b4043d38c8ffbe6e04dd31591519879ba28fc
+  metadata.gz: b0b25708e10d77c473b33ff4f46b1537b0977bb18c990f54bdf33afc4b3a6947
+  data.tar.gz: d2faea5f93812588a2850b5cf5e2bb84e5efbf3295331e7340f2153d43ec2841
 SHA512:
-  metadata.gz: 315e2811f8fae61526706f1abd9bc3ac29b5422b116209b061934fa79a015e98b5c8fc500d0c506fc66a265e35a3bb7360c130f6c60d939f369aad5ca53e7d66
-  data.tar.gz: 5dd04e693a74c96944866133ceacf0fe37359b1ac919249fca883c37d4162c3a0b8689593a666ca0e9181ce0fbc31fa6d53290da5c0b573ce2c58d8cf145dc29
+  metadata.gz: a732fd7615496308c4e10da3b73dfbdf82e0713d906719e618e9a07fc1611a279b12186ff232b467ae2c42663dc4314b592c848810acc3882af006806bce3220
+  data.tar.gz: b9b4ee9cbb20796597ca64dfd4c0d621c2f88b66655544c3e0f376c3e0defd71b261f489f3ccd90ddbdd087e3059bed8147d96ee84e3a0edf6e5f539b039efdf

data/lib/neetodeploy/autoscale/middleware.rb

@@ -12,7 +12,7 @@ module Neetodeploy
     def call(env)
       url = URI.parse("https://nd-queue-time-exporter.neetodeployapp.com/metrics")
 
-      query_params = URI.encode_www_form(app_name: ENV.to_h["NEETODEPLOY_APP_NAME"], queue_time: queue_time(env))
+      query_params = URI.encode_www_form(app_name: ENV.to_h["NEETODEPLOY_APP_NAME"], process_type: "web", queue_time: queue_time(env))
 
       url.query = query_params
 
@@ -31,17 +31,17 @@ module Neetodeploy
     def started_at(env)
       return nil unless env["HTTP_X_REQUEST_START"].present?
 
-      Time.at(env["HTTP_X_REQUEST_START"].to_i / 1000)
+      env["HTTP_X_REQUEST_START"].to_i
     end
 
     def network_time(env)
       env["puma.request_body_wait"].to_i
     end
 
-    def queue_time(now = Time.now, env)
+    def queue_time(now = Time.now.to_f * 1000, env)
       return if started_at(env).nil?
 
-      queue_time = ((now - started_at(env)) * 1000).to_i
+      queue_time = (now - started_at(env)).round
       queue_time -= network_time(env)
 
       queue_time.positive? ? queue_time : 0

data/lib/neetodeploy/autoscale/sidekiq_middleware.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "time"
+
+module Neetodeploy
+  class SidekiqMiddleware
+    def call(worker, job, queue)
+      url = URI.parse("https://nd-queue-time-exporter.neetodeployapp.com/metrics")
+
+      query_params = URI.encode_www_form(app_name: ENV.to_h["NEETODEPLOY_APP_NAME"], process_type: "worker", queue_time: queue_time(worker, job, queue))
+
+      url.query = query_params
+
+      post = Net::HTTP::Post.new(url)
+      post["AuthToken"] = "K0An3O3MSyEEMTCnRd1IHgGjdGQkzy"
+
+      Net::HTTP.start(url.host, url.port, use_ssl: false) do |http|
+        http.request(post)
+      end
+
+      yield
+    end
+
+    private
+
+    def queue_time(worker, job, queue)
+      (Time.now - Time.at(job["created_at"])) * 1000
+    end
+  end
+end

data/lib/neetodeploy/autoscale/version.rb

@@ -2,6 +2,6 @@
 
 module Neetodeploy
   module Autoscale
-    VERSION = "0.4.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/neetodeploy-autoscale.rb

@@ -5,10 +5,29 @@ require_relative "neetodeploy/autoscale/version"
 module Neetodeploy
   module Autoscale
     class Error < StandardError; end
+
+    class << self
+      def setup_middleware
+        require "neetodeploy/autoscale/middleware"
+        Neetodeploy::Autoscale.setup_rails if defined? Rails
+        Neetodeploy::Autoscale.setup_sidekiq if defined?(Sidekiq)
+      end
+
+      def setup_rails
+        require "neetodeploy/autoscale/railtie"
+      end
+
+      def setup_sidekiq
+        require "neetodeploy/autoscale/sidekiq_middleware"
+
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.add Neetodeploy::SidekiqMiddleware
+          end
+        end
+      end
+    end
   end
 end
 
-if ENV.to_h["NEETODEPLOY_APP_NAME"].present?
-  require "neetodeploy/autoscale/middleware"
-  require "neetodeploy/autoscale/railtie" if defined? Rails
-end
+ENV.to_h["NEETODEPLOY_APP_NAME"].present? && Neetodeploy::Autoscale.setup_middleware

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy-autoscale
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sreeram Venkitesh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies: []
 description: For automatically scaling your Rails application based on network metrics
 email:
@@ -25,6 +25,7 @@ files:
 - lib/neetodeploy-autoscale.rb
 - lib/neetodeploy/autoscale/middleware.rb
 - lib/neetodeploy/autoscale/railtie.rb
+- lib/neetodeploy/autoscale/sidekiq_middleware.rb
 - lib/neetodeploy/autoscale/version.rb
 homepage: https://neetodeploy.com
 licenses: []
@@ -47,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: neetoDeploy autoscaler gem