prometheus_reporter 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c11682f278ffa6194feba297168ed641d4824b1c
-  data.tar.gz: cdfeba4d64550cb025823205cd97e43b6cea3047
+  metadata.gz: fae87b53213b822058903b0c524c2213ccf43702
+  data.tar.gz: 5abac85356c30d2948797ee6086666945d3cb925
 SHA512:
-  metadata.gz: 8f43647a52cb5db960921c3fe8d821760a739d9513a0d53ee8fcaa856555d6555eca907ea407f9fbb5ee253734f665f70346d9c8df59ea1e5a5149b8e0d04d01
-  data.tar.gz: 2fc302c361a09b9af7fc1ccc82c1aad3f7c75faadd21b0eda5fe1c393fa4934b2a7fe5fd75e5b9cd39f3a7d22d1b74e4653a145b1ca09254f04d78be056f34b0
+  metadata.gz: 253dcc039a2952010428dd395faef3b6ce182b9ad2a384b830fcc489fbadd96ef08a09efd62e70f3129f9ebef3746a0114a4f67d205eec3135c331725651ee6a
+  data.tar.gz: c6f7b19c5d3dbb1413df75135c8d778c70608b25c2aadc46a103a4ced08d0cfb09a7c2a1ad7ddb7d60f38b78b20d84f076ea578a6b3d6f5070fcb8d0574ec6d8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.1 (2018-01-31)
+Report is always the same despite the order of methods called
+
 ## 1.1.0 (2018-01-15)
 Added TextFormatter.draw method with DSL
 

data/README.md

@@ -23,7 +23,7 @@ $ gem install prometheus_reporter
 ```
 or using `Gemfile`:
 ```ruby
-gem 'prometheus_reporter', '~> 1.0'
+gem 'prometheus_reporter', '~> 1.1.1'
 ```
 ## Configuration
 
@@ -52,6 +52,24 @@ f.to_s # => "facebook_clone_emails_count 987\n"
 
 ## Usage
 
+### DSL
+
+You can also use DSL to define reports:
+
+```ruby
+report =
+  PrometheusReporter::TextFormatter.draw(prefix: 'my_application') do
+    type  :emails_today, :counter
+    entry :emails_today, value: 1337
+
+    type  :registrations_today, :counter
+    entry :registrations_today, value: 105
+
+    type  :payments_total, :summary
+    entry :payments_total, 29913
+  end
+```
+
 ### Creating text report for Prometheus:
 
 ```ruby
@@ -80,24 +98,6 @@ facebook_clone_emails_today{type="notify_for_inactivity"} 10 1515681885
 facebook_clone_emails_today{type="registration_confirmation"} 18 1515681886
 ```
 
-### DSL
-
-You can also use DSL to define reports:
-
-```ruby
-report =
-  PrometheusReporter::TextFormatter.draw(prefix: 'my_application') do
-    type  :emails_today, :counter
-    entry :emails_today, value: 1337
-
-    type  :registrations_today, :counter
-    entry :registrations_today, value: 105
-
-    type  :payments_total, :summary
-    entry :payments_total, 29913
-  end
-```
-
 ## Usefull links
 - Official Prometheus [ruby client](https://github.com/prometheus/client_ruby)
 - [Prometheus](https://github.com/prometheus) itself

data/lib/prometheus_reporter/text_formatter.rb

@@ -50,7 +50,7 @@ module PrometheusReporter
     def to_s
       metrics_data = []
 
-      @data.each do |prometheus_key_name, prometheus_key_values|
+      sort_hash(@data).each do |prometheus_key_name, prometheus_key_values|
         prometheus_key_values = prometheus_key_values.compact
         validate_data!(prometheus_key_name, prometheus_key_values)
         metrics_data << metric_entry(prometheus_key_name, prometheus_key_values)
@@ -89,6 +89,7 @@ module PrometheusReporter
       prometheus_key_values.each do |label_or_token, value|
         metric_lines << text_entry(prometheus_key_name, label_or_token, value)
       end
+      metric_lines.sort!
       (metric_lines << nil).join(SEPARATOR)
     end
 
@@ -120,5 +121,9 @@ module PrometheusReporter
 
       "{#{labels_str}}"
     end
+
+    def sort_hash(hash)
+      Hash[hash.sort]
+    end
   end
 end

data/lib/prometheus_reporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusReporter
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_reporter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Oleksii Kuznietsov (nattfodd)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry