puma-cloudwatch 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599b6819f8b72237a6fee5a64c7e0f9060da208b80291a24f5bf3b3b7cf93eef
-  data.tar.gz: e53f1ff64f41be6c3349a8d8a009ab7ccebcfec0d82c1b2f03fd318338250d15
+  metadata.gz: ef9ffddc149af0d9bfbd27b26a36e81950f3744ec4111e56ff10f94d824133b0
+  data.tar.gz: a472a1792d0c98daaf40dbc58f6642d630963d5947c496fe7831056913390064
 SHA512:
-  metadata.gz: 4f1dca7162a90b61399dda3b6ca7b3807ef95323be856c7ac9c74a94b70c14c65e8aaa6bca18b092c85ae4fce5c3ef8e71027a2ca39a02f774b41a8f5143fe38
-  data.tar.gz: 29d39a09ce1e5ff472ba549fd20356f7ae7e2826aab2d40ce2471b4d5f7d54e757d88c2f689dea637127439504fcc11a1d8dadbe5b793caffa0463a2fd68ff20
+  metadata.gz: b083ddc6806fd2cd94c25870aa8318cced2cb62d8f8cf0fbfdf09196812221a84904b97813dd533f965a9afb1233632c18dd57c25c4a545b260a8b928c0f7278
+  data.tar.gz: 6c2af8d7dacd031777e4f75c993842cb94d5c51f1bf96190a9c7bd88de342e8bbdad417da9fb74fa28646edfa88432ef53f71acba9762f8f7c90a96bdbd54f90

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.5.2] - 2024-10-11
+- [#16](https://github.com/tongueroo/puma-cloudwatch/pull/16) feat: permit multiple metric dimensions
+
 ## [0.5.1] - 2023-11-13
 - [#13](https://github.com/tongueroo/puma-cloudwatch/pull/13) delay error messages until first successful fetch
 

data/README.md

@@ -14,6 +14,10 @@ It also strongly encourage to set the `PUMA_CLOUDWATCH_DIMENSION_VALUE` env vari
 
     PUMA_CLOUDWATCH_DIMENSION_VALUE=demo-web-puma
 
+Or if you need to set multiple dimensions, you could use something like:
+
+    PUMA_CLOUDWATCH_DIMENSIONS="Service=web,Cluster=primary,Environment=production"
+
 Then you can get metrics for your `demo-web-puma` app. List of metrics:
 
 * pool_capacity: the number of requests that the server is capable of taking right now.
@@ -34,6 +38,7 @@ Env Var | Description | Default Value
 PUMA\_CLOUDWATCH\_DEBUG | When set, the plugin prints out the metrics that get sent to CloudWatch. | (unset)
 PUMA\_CLOUDWATCH\_DIMENSION\_NAME | CloudWatch metric dimension name | App
 PUMA\_CLOUDWATCH\_DIMENSION\_VALUE | CloudWatch metric dimension value | puma
+PUMA\_CLOUDWATCH\_DIMENSIONS | CloudWatch metric dimensions | (unset)
 PUMA\_CLOUDWATCH\_ENABLED | Enables sending of the data to CloudWatch. | (unset)
 PUMA\_CLOUDWATCH\_FREQUENCY | How often to send data to CloudWatch in seconds. | 60
 PUMA\_CLOUDWATCH\_NAMESPACE | CloudWatch metric namespace | WebServer

data/lib/puma_cloudwatch/metrics/sender.rb

@@ -14,8 +14,7 @@ class PumaCloudwatch::Metrics
     def initialize(metrics)
       @metrics = metrics
       @namespace = ENV['PUMA_CLOUDWATCH_NAMESPACE'] || "WebServer"
-      @dimension_name = ENV['PUMA_CLOUDWATCH_DIMENSION_NAME'] || "App"
-      @dimension_value = ENV['PUMA_CLOUDWATCH_DIMENSION_VALUE'] || "puma"
+      @dimensions = calculate_dimensions
       @frequency = Integer(ENV['PUMA_CLOUDWATCH_FREQUENCY'] || 60)
       @enabled = ENV['PUMA_CLOUDWATCH_ENABLED'] || false
       @region = ENV['PUMA_CLOUDWATCH_AWS_REGION']
@@ -23,6 +22,27 @@ class PumaCloudwatch::Metrics
       @secret_access_key = ENV['PUMA_CLOUDWATCH_AWS_SECRET_ACCESS_KEY']
     end
 
+    def calculate_dimensions
+      if ENV.key?('PUMA_CLOUDWATCH_DIMENSIONS')
+        ENV['PUMA_CLOUDWATCH_DIMENSIONS'].split(',').map(&:strip).map do |dimension|
+          name, value = dimension.split('=').map(&:strip)
+
+          {
+            name: name,
+            value: value,
+          }
+        end
+      else
+        name = ENV['PUMA_CLOUDWATCH_DIMENSION_NAME'] || "App"
+        value = ENV['PUMA_CLOUDWATCH_DIMENSION_VALUE'] || "puma"
+
+        [
+          name: name,
+          value: value
+        ]
+      end
+    end
+
     def call
       put_metric_data(
         namespace: @namespace,
@@ -58,7 +78,7 @@ class PumaCloudwatch::Metrics
         metric.each do |name, values|
           data << {
             metric_name: name.to_s,
-            dimensions: dimensions,
+            dimensions: @dimensions,
             storage_resolution: @frequency < 60 ? 1 : 60,
             statistic_values: {
               sample_count: values.length,
@@ -72,13 +92,6 @@ class PumaCloudwatch::Metrics
       data
     end
 
-    def dimensions
-      [
-        name: @dimension_name,
-        value: @dimension_value
-      ]
-    end
-
   private
     def put_metric_data(params)
       if ENV['PUMA_CLOUDWATCH_DEBUG']

data/lib/puma_cloudwatch/version.rb

@@ -1,3 +1,3 @@
 module PumaCloudwatch
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatch
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Puma plugin sends puma stats to CloudWatch