yabeda-rails 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95166b3713d896663737aaf5fb6c485df43557d946c510f957fb3ab42e3e0d38
-  data.tar.gz: 0a8c2b72c450564b8fad46c1ac67c9895f342366d36d967611f576bd63275cea
+  metadata.gz: 57391802b01a1ba8d7957b6aa3a41ebda6fcf3663587fd1cfdb87dcda3735ac7
+  data.tar.gz: 13db9080e69a1dc4d110ee49f38610990b1c025c3bbc1d1151ec43cd67ed2520
 SHA512:
-  metadata.gz: 512a1d39088979606534b7de183e26aeed5aa2b7d4f2394b8b21cfb0b9ceec0735e35d34ef7a3a8a738468f4fc72d28a1825604f143a00b88e2649bcfd5b44dd
-  data.tar.gz: cc4b86dab98e360b4d5b481a593533f60f0d5af3d70a0acda3f45935968097eef02fef32ec6b65e57bc260a0d3d7f34561b2584f3f0a001da238e182b7bfd285
+  metadata.gz: 2e7fc9992fa76b68825e1ff0f35073fee8f18e8bee4fe564de15d6ed7a38ae0e17617c061594760ae92585866f214798635c2866264f25963e588ffc7bb1eba0
+  data.tar.gz: 478201adab47ddb487f12d5ec61fe55fc02b86d3bc779fe088d9bca7a13568468c310ac4dd46497e5a222e1eeeb604da43a5b0b1d270b22cffe0bc5cb559f318

data/.github/workflows/test.yml

@@ -18,16 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby:  "3.1"
+          - ruby:  "3.2"
             rails: "HEAD"
-          - ruby:  "3.0"
+          - ruby:  "3.1"
             rails: "7.0"
-          - ruby:  "2.7"
+          - ruby:  "3.0"
             rails: "6.1"
-          - ruby:  "2.6"
+          - ruby:  "2.7"
             rails: "6.0"
-          - ruby:  "2.5"
-            rails: "5.2"
     container:
       image: ruby:${{ matrix.ruby }}
       env:
@@ -42,8 +40,6 @@ jobs:
           restore-keys: |
             bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
             bundle-${{ matrix.ruby }}-
-      - name: Upgrade Bundler to 2.0 (for older Rubies)
-        run: gem install bundler -v '~> 2.0'
       - name: Bundle install
         run: |
           bundle config path vendor/bundle

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
 - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Metrics/BlockLength:
   Exclude:

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.9.0 - 2023-08-03
+
+### Added
+
+- Ability to switch controller name case in `controller` tag between `:snake` and `:camel` case. [@lewispb][] in [#26](https://github.com/yabeda-rb/yabeda-rails/pull/26)
+
+## Changed
+
+- Minimal Ruby version increased to 2.5. [@Envek][]
+
 ## 0.8.1 - 2022-06-06
 
 ### Fixed
@@ -85,3 +95,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [@liaden]: https://github.com/liaden "Joel Johnson"
 [@lautis]: https://github.com/lautis "Ville Lautanala"
 [@dks17]: https://github.com/dks17 "Konstantin"
+[@lewispb]: https://github.com/lewispb "Lewis Buckley"

data/lib/yabeda/rails/config.rb

@@ -4,10 +4,12 @@ require "anyway"
 
 module Yabeda
   module Rails
+    # yabeda-rails configuration
     class Config < ::Anyway::Config
       config_name :yabeda_rails
 
       attr_config :apdex_target
+      attr_config controller_name_case: :snake
     end
   end
 end

data/lib/yabeda/rails/event.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Yabeda
+  module Rails
+    # ActiveSupport Event with added logic for Yabeda tags formatting
+    class Event < ActiveSupport::Notifications::Event
+      def labels
+        @labels ||= begin
+          labels = {
+            controller: controller,
+            action: action,
+            status: status,
+            format: format,
+            method: method,
+          }
+          labels.merge(payload.slice(*Yabeda.default_tags.keys - labels.keys))
+        end
+      end
+
+      def duration
+        ms2s super
+      end
+
+      def view_runtime
+        ms2s payload[:view_runtime]
+      end
+
+      def db_runtime
+        ms2s payload[:db_runtime]
+      end
+
+      private
+
+      def controller
+        case Yabeda::Rails.config.controller_name_case
+        when :camel
+          payload[:controller]
+        else
+          payload[:params]["controller"]
+        end
+      end
+
+      def action
+        payload[:action]
+      end
+
+      def status
+        if payload[:status].nil? && payload[:exception].present?
+          ActionDispatch::ExceptionWrapper.status_code_for_exception(payload[:exception].first)
+        else
+          payload[:status]
+        end
+      end
+
+      def format
+        payload[:format]
+      end
+
+      def method
+        payload[:method].downcase
+      end
+
+      def ms2s(milliseconds)
+        (milliseconds.to_f / 1000).round(3)
+      end
+    end
+  end
+end

data/lib/yabeda/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Rails
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

data/lib/yabeda/rails.rb

@@ -5,6 +5,7 @@ require "active_support"
 require "rails/railtie"
 require "yabeda/rails/railtie"
 require "yabeda/rails/config"
+require "yabeda/rails/event"
 
 module Yabeda
   # Minimal set of Rails-specific metrics for using with Yabeda
@@ -27,7 +28,7 @@ module Yabeda
       # rubocop: disable Metrics/MethodLength, Metrics/BlockLength, Metrics/AbcSize
       def install!
         Yabeda.configure do
-          config = Config.new
+          config = ::Yabeda::Rails.config
 
           group :rails
 
@@ -54,39 +55,23 @@ module Yabeda
           end
 
           ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
-            event = ActiveSupport::Notifications::Event.new(*args)
-            labels = {
-              controller: event.payload[:params]["controller"],
-              action: event.payload[:params]["action"],
-              status: Yabeda::Rails.event_status_code(event),
-              format: event.payload[:format],
-              method: event.payload[:method].downcase,
-            }
-            labels.merge!(event.payload.slice(*Yabeda.default_tags.keys - labels.keys))
+            event = Yabeda::Rails::Event.new(*args)
 
-            rails_requests_total.increment(labels)
-            rails_request_duration.measure(labels, Yabeda::Rails.ms2s(event.duration))
-            rails_view_runtime.measure(labels, Yabeda::Rails.ms2s(event.payload[:view_runtime]))
-            rails_db_runtime.measure(labels, Yabeda::Rails.ms2s(event.payload[:db_runtime]))
+            rails_requests_total.increment(event.labels)
+            rails_request_duration.measure(event.labels, event.duration)
+            rails_view_runtime.measure(event.labels, event.view_runtime)
+            rails_db_runtime.measure(event.labels, event.db_runtime)
 
             Yabeda::Rails.controller_handlers.each do |handler|
-              handler.call(event, labels)
+              handler.call(event, event.labels)
             end
           end
         end
       end
       # rubocop: enable Metrics/MethodLength, Metrics/BlockLength, Metrics/AbcSize
 
-      def ms2s(milliseconds)
-        (milliseconds.to_f / 1000).round(3)
-      end
-
-      def event_status_code(event)
-        if event.payload[:status].nil? && event.payload[:exception].present?
-          ActionDispatch::ExceptionWrapper.status_code_for_exception(event.payload[:exception].first)
-        else
-          event.payload[:status]
-        end
+      def config
+        @config ||= Config.new
       end
     end
   end

data/yabeda-rails.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.add_dependency "activesupport"
   spec.add_dependency "anyway_config", ">= 1.3", "< 3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,7 @@ files:
 - bin/setup
 - lib/yabeda/rails.rb
 - lib/yabeda/rails/config.rb
+- lib/yabeda/rails/event.rb
 - lib/yabeda/rails/railtie.rb
 - lib/yabeda/rails/version.rb
 - yabeda-rails-logo.png
@@ -152,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="