yabeda-rails 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a74f3febe6bcdda7d43527a9b9acb71434e58f2abc5518b2a68c609541bf89
-  data.tar.gz: f223f9a5df2d1a224e77cec0a9e09357eaeccf0532f5a6c4b8859c82ed4ab909
+  metadata.gz: 107b2a512068172c19c08b18dc0f452d9ee1794c4894979b1a88c459a8dcf5c5
+  data.tar.gz: 686e32000199bc29bb8096d09aa336b4cf67d9cfe789e44b91653467caee5524
 SHA512:
-  metadata.gz: 8d2cf3ed506addf2aabcd6bebeaf77fdc80d29ea091a2f8f4d9ef550e3bc74e33a9a4faad6e82ec3ea7f280311a80860f985a6f971fcaa1847b86e7d5907bc95
-  data.tar.gz: de1ebbcfbfc3e9423a9033b1080426dd0466e665a9485dd13bc5df4bc60b982c049f156ec8499b38cbca3e26a0ffec2dba571b7f252ee7e7daf299e1ff81070c
+  metadata.gz: f59dd373f43b40e47b03cecef02ad47ce8fdcf49661430fddf003007f60d69895a26e538d23bd829e664aaa27145789f2a934ed401d6c593ca314ff3271d65d2
+  data.tar.gz: 6de6d25b29ef13f07f9a1e008999577c18891ceaede127a99ac541235442ed72f3b74316e6f7b16950169fd5309e6d1fcc86cf2b4999106ff08a46349db27e0b

data/.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - '**'
+    tags-ignore:
+      - 'v*'
+
+jobs:
+  rubocop:
+    # Skip running tests for local pull requests (use push event instead), run only for foreign ones
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+          bundler-cache: true
+      - name: Lint Ruby code with RuboCop
+        run: |
+          bundle exec rubocop

data/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Run tests
+name: Tests
 
 on:
   pull_request:
@@ -10,21 +10,29 @@ on:
 
 jobs:
   test:
-    name: "Run tests"
-    if: "! contains(toJSON(github.event.commits.latest.message), '[ci skip]')"
+    name: 'Rails ${{ matrix.rails }} × Ruby ${{ matrix.ruby }}'
+    # Skip running tests for local pull requests (use push event instead), run only for foreign ones
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - ruby: 3.0
-          - ruby: 2.7
-          - ruby: 2.6
-          - ruby: 2.5
+          - ruby:  "3.1"
+            rails: "HEAD"
+          - ruby:  "3.0"
+            rails: "7.0"
+          - ruby:  "2.7"
+            rails: "6.1"
+          - ruby:  "2.6"
+            rails: "6.0"
+          - ruby:  "2.5"
+            rails: "5.2"
     container:
       image: ruby:${{ matrix.ruby }}
       env:
         CI: true
+        RAILS_VERSION: ${{ matrix.rails }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -41,7 +49,5 @@ jobs:
           bundle config path vendor/bundle
           bundle install
           bundle update
-      - name: Run Rubocop
-        run: bundle exec rubocop
       - name: Run RSpec
         run: bundle exec rspec

data/.rubocop.yml

@@ -41,3 +41,5 @@ Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: consistent_comma
 
+Bundler/DuplicatedGem:
+  Enabled: false

data/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.8.0 - 2022-05-30
+
+### Added
+
+- Add ability to expose custom Apdex target value for later use in graphs/alerts. [@Envek][] in [#18](https://github.com/yabeda-rb/yabeda-rails/pull/18)
+
+### Changed
+
+- Reduce number of dependencies by depending only on railties instead of the whole Ruby on Rails. [@lautis][] in [#23](https://github.com/yabeda-rb/yabeda-rails/pull/23).
+
 ## 0.7.2 - 2021-03-15
 
 ### Fixed
@@ -65,4 +75,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
    Basic metrics for request durations by controller, action, status, format, and method. ActiveRecord and ActionView timings.
 
+[@Envek]: https://github.com/Envek "Andrey Novikov"
 [@liaden]: https://github.com/liaden "Joel Johnson"
+[@lautis]: https://github.com/lautis "Ville Lautanala"

data/Gemfile

@@ -7,9 +7,26 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in yabeda-rails.gemspec
 gemspec
 
+rails_version = ENV.fetch("RAILS_VERSION", "~> 7.0")
+case rails_version
+when "HEAD"
+  git "https://github.com/rails/rails.git" do
+    gem "rails"
+    gem "activesupport"
+    gem "railties"
+  end
+else
+  rails_version = "~> #{rails_version}.0" if rails_version.match?(/^\d+\.\d+$/)
+  gem "rails", rails_version
+  gem "activesupport", rails_version
+  gem "railties", rails_version
+end
+
 group :development, :test do
-  gem "pry"
-  gem "pry-byebug", platform: :mri
+  gem "yabeda", "~> 0.11" # Test helpers
+  gem "rspec-rails"
+
+  gem "debug"
 
   gem "rubocop", "~> 1.8"
   gem "rubocop-rspec"

data/README.md

@@ -1,4 +1,4 @@
-# Yabeda::[Rails]
+# ![Yabeda::Rails](./yabeda-rails-logo.png)
 
 Built-in metrics for out-of-the box [Rails] applications monitoring.
 

data/lib/yabeda/rails/config.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "anyway"
+
+module Yabeda
+  module Rails
+    class Config < ::Anyway::Config
+      config_name :yabeda_rails
+
+      attr_config :apdex_target
+    end
+  end
+end

data/lib/yabeda/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Rails
-    VERSION = "0.7.2"
+    VERSION = "0.8.0"
   end
 end

data/lib/yabeda/rails.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require "yabeda"
-require "rails"
+require "active_support"
+require "rails/railtie"
 require "yabeda/rails/railtie"
+require "yabeda/rails/config"
 
 module Yabeda
   # Minimal set of Rails-specific metrics for using with Yabeda
@@ -25,6 +27,8 @@ module Yabeda
       # rubocop: disable Metrics/MethodLength, Metrics/BlockLength, Metrics/AbcSize
       def install!
         Yabeda.configure do
+          config = Config.new
+
           group :rails
 
           counter   :requests_total,   comment: "A counter of the total number of HTTP requests rails processed.",
@@ -43,6 +47,12 @@ module Yabeda
                                  comment: "A histogram of the activerecord execution time.",
                                  tags: %i[controller action status format method]
 
+          if config.apdex_target
+            gauge :apdex_target, unit: :seconds,
+                                 comment: "Tolerable time for Apdex (T value: maximum duration of satisfactory request)"
+            collect { rails_apdex_target.set({}, config.apdex_target) }
+          end
+
           ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
             labels = {

data/yabeda-rails.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.4"
 
-  spec.add_dependency "rails"
+  spec.add_dependency "activesupport"
+  spec.add_dependency "anyway_config", ">= 1.3", "< 3"
+  spec.add_dependency "railties"
   spec.add_dependency "yabeda", "~> 0.8"
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,17 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,6 +122,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build-release.yml"
+- ".github/workflows/lint.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -100,8 +135,10 @@ files:
 - bin/console
 - bin/setup
 - lib/yabeda/rails.rb
+- lib/yabeda/rails/config.rb
 - lib/yabeda/rails/railtie.rb
 - lib/yabeda/rails/version.rb
+- yabeda-rails-logo.png
 - yabeda-rails.gemspec
 homepage: https://github.com/yabeda-rb/yabeda-rails
 licenses:
@@ -122,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Extensible metrics for monitoring Ruby on Rails application