measurometer 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df51b60bd2fe7c7c02cbd31be5729b6ecf73f4bd648f1fb423bc493510555215
-  data.tar.gz: a92627ad8a3e285b5848a2295cc0ae5fd76082adc26dcf927aaed7314fe34013
+  metadata.gz: 145560329721f78f9988635eb5bbfcdeffd37ddaf3a5a14e2cf5891f76b94544
+  data.tar.gz: a59156c128ce042aeb54ef08c94c8786aeed80456a2c38ea2a892861d0cd1642
 SHA512:
-  metadata.gz: 847d3e71f92b9920736f8ab9f978fe153663368edbf4b78e2bee3d7063e97a18157323f2ff8fcaa3c5931cd4a07075f0cd5dc826803f44789485b4a4fd7db734
-  data.tar.gz: 570a3a98e128e02b2f7b1c6e4af64d4e5e78d8ad5a767fb401df9dc8e43212417716409c88049c3655be55be9b075eb6f8e7df78a5e92bfb9de835865289aef1
+  metadata.gz: 667108345d55245fed14812c07608f2fde96d6455e92d14be8dd2e56a9a298c82464703a46e42e349a670277197adc6b105239e5c89711161bc6f9cabf0efff4
+  data.tar.gz: c24c904cee40f2be10bbadba2aafe3c91b1e973782597678ad9e87cd7920a66a77b897c11739c961edf7c7ef10f990dc2d7ccb15adee68305c372ef0bbf5b10b

data/.github/workflows/main.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on: [push,pull_request]
+
+env:
+  BUNDLE_PATH: vendor/bundle
+
+jobs:
+  test:
+    name: Specs
+    runs-on: ubuntu-18.04
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 2.6
+          - 2.5
+        experimental: [false]
+        include:
+          - ruby: 3.0
+            experimental: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Gemfile Cache
+        uses: actions/cache@v2
+        with:
+          path: Gemfile.lock
+          key: ${{ runner.os }}-gemlock-${{ matrix.ruby }}-${{ hashFiles('Gemfile', 'measurometer.gemspec') }}
+          restore-keys: |
+            ${{ runner.os }}-gemlock-${{ matrix.ruby }}-
+      - name: Bundle Cache
+        id: cache-gems
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ hashFiles('Gemfile', 'Gemfile.lock', 'measurometer.gemspec') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}-
+            ${{ runner.os }}-gems-
+      - name: Bundle Install
+        if: steps.cache-gems.outputs.cache-hit != 'true'
+        run: bundle install --jobs 4 --retry 3
+      - name: RSpec
+        continue-on-error: ${{ matrix.experimental }}
+        run: bundle exec rspec

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0
+
+* Adds support to set a tag on Appsignal in methods `increment_counter` and `set_gauge`
+
 # 1.1.1
 
 * Automatically convert metric and instrumentation block names to Strings, since i.e.

data/lib/measurometer.rb

@@ -71,8 +71,8 @@ module Measurometer
     # @param counter_path[String] under which path to push the metric
     # @param by[Integer] the counter increment to apply
     # @return nil
-    def increment_counter(counter_path, by = 1)
-      @drivers.each { |d| d.increment_counter(counter_path.to_s, by) }
+    def increment_counter(counter_path, by = 1, tags={})
+      @drivers.each { |d| d.increment_counter(counter_path.to_s, by, tags) }
       nil
     end
 
@@ -81,8 +81,8 @@ module Measurometer
     # @param gauge_name[String] under which path to push the metric
     # @param value[Integer] the absolute value of the gauge
     # @return nil
-    def set_gauge(gauge_name, value)
-      @drivers.each { |d| d.set_gauge(gauge_name.to_s, value) }
+    def set_gauge(gauge_name, value, tags={})
+      @drivers.each { |d| d.set_gauge(gauge_name.to_s, value, tags) }
       nil
     end
   end

data/lib/measurometer/statsd_driver.rb

@@ -17,7 +17,7 @@ module Measurometer
       end
     end
 
-    def increment_counter(counter_name, by)
+    def increment_counter(counter_name, by, _tags={})
       @statsd_client.increment(counter_name, by)
     end
 
@@ -25,7 +25,7 @@ module Measurometer
       @statsd_client.count(key_path, value)
     end
 
-    def set_gauge(gauge_name, value)
+    def set_gauge(gauge_name, value, _tags={})
       @statsd_client.gauge(gauge_name, value)
     end
 

data/lib/measurometer/version.rb

@@ -1,3 +1,3 @@
 module Measurometer
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/measurometer.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Measurometer::VERSION
   spec.authors       = ['Julik Tarkhanov']
   spec.email         = ['me@julik.nl']
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.summary       = 'Minimum viable API for instrumentation in libraries'
   spec.description   = 'Minimum viable API for instrumentation in libraries. Source metrics from your libraries to Measurometer, pick them up on the other end in the application, centrally.'

data/spec/measurometer/statsd_driver_spec.rb

@@ -14,7 +14,9 @@ describe 'Measurometer::StatsdDriver' do
     end
 
     Measurometer.set_gauge('app.some_gauge', 42)
+    Measurometer.set_gauge('app.another_gauge', 43, ignore_this_tag: 2)
     Measurometer.increment_counter('app.some_counter', 2)
+    Measurometer.increment_counter('app.another_counter', 3, ignore_this_tag: 1)
     Measurometer.add_distribution_value('app.some_sample', 42)
 
     expect(statsd).to have_received(:timing) { |block_name, timing_millis|
@@ -23,6 +25,8 @@ describe 'Measurometer::StatsdDriver' do
     }
 
     expect(statsd).to have_received(:increment).with('app.some_counter', 2)
+    expect(statsd).to have_received(:increment).with('app.another_counter', 3)
     expect(statsd).to have_received(:count).with('app.some_sample', 42)
+    expect(statsd).to have_received(:gauge).with('app.another_gauge', 43)
   end
 end

data/spec/measurometer_spec.rb

@@ -9,13 +9,14 @@ RSpec.describe Measurometer do
     end
   end
 
+  before(:each) { Measurometer.drivers.clear }
+  after(:each) { Measurometer.drivers.clear }
+
   it 'has a version number' do
     expect(Measurometer::VERSION).not_to be nil
   end
 
   describe '.drivers' do
-    before(:each) { Measurometer.drivers.clear }
-    after(:each) { Measurometer.drivers.clear }
     let(:driver) { Object.new }
 
     it 'allows adding and removing a driver' do
@@ -43,41 +44,55 @@ RSpec.describe Measurometer do
       Measurometer.drivers << driver
       result = Measurometer.add_distribution_value(:bar_intensity, 114.4)
       expect(result).to be_nil
-      Measurometer.drivers.delete(driver)
     end
   end
 
   describe '.increment_counter' do
     it 'increments by 1 by default and converts the counter name to a String before passing it to the driver' do
       driver = double
-      expect(driver).to receive(:increment_counter).with('barness', 1)
+      expect(driver).to receive(:increment_counter).with('barness', 1, {})
 
       Measurometer.drivers << driver
       result = Measurometer.increment_counter(:barness)
       expect(result).to be_nil
-      Measurometer.drivers.delete(driver)
     end
 
     it 'passes the increment to the driver' do
       driver = double
-      expect(driver).to receive(:increment_counter).with('barness', 123)
+      expect(driver).to receive(:increment_counter).with('barness', 123, {})
 
       Measurometer.drivers << driver
       result = Measurometer.increment_counter(:barness, 123)
       expect(result).to be_nil
-      Measurometer.drivers.delete(driver)
+    end
+
+    it 'passes tags to the driver' do
+      driver = double
+      expect(driver).to receive(:increment_counter).with('barness', 123, tag1: 11, tag2: 22)
+
+      Measurometer.drivers << driver
+      result = Measurometer.increment_counter(:barness, 123, tag1: 11, tag2: 22)
+      expect(result).to be_nil
     end
   end
 
   describe '.set_gauge' do
     it 'converts the gauge name to a String before passing it to the driver' do
       driver = double
-      expect(driver).to receive(:set_gauge).with('fooeyness', 456)
+      expect(driver).to receive(:set_gauge).with('fooeyness', 456, {})
 
       Measurometer.drivers << driver
       result = Measurometer.set_gauge(:fooeyness, 456)
       expect(result).to be_nil
-      Measurometer.drivers.delete(driver)
+    end
+
+    it 'passes tags to the driver' do
+      driver = double
+      expect(driver).to receive(:set_gauge).with('fooeyness', 123, tag1: 11, tag2: 22)
+
+      Measurometer.drivers << driver
+      result = Measurometer.set_gauge(:fooeyness, 123, tag1: 11, tag2: 22)
+      expect(result).to be_nil
     end
   end
 
@@ -132,12 +147,12 @@ RSpec.describe Measurometer do
         @distributions << [value_path, value]
       end
 
-      def increment_counter(value_path, value)
+      def increment_counter(value_path, value, tags={})
         @counters ||= []
         @counters << [value_path, value]
       end
 
-      def set_gauge(value_path, value)
+      def set_gauge(value_path, value, tags={})
         @gauges ||= []
         @gauges << [value_path, value]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measurometer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Julik Tarkhanov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,10 +75,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -97,7 +97,7 @@ files:
 homepage: https://github.com/WeTransfer/measurometer
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Minimum viable API for instrumentation in libraries
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.14.6