appsignal 3.0.25-java → 3.0.26-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deaef7e2168cb358393f26888084c1ea47efd1a370022a74a751c12b3d2a5f05
-  data.tar.gz: b8df7d9e2c01c03797a17e253dcb1cd54ed5df50b533deb4a91e94c5cdf7a3f8
+  metadata.gz: 28f5360b1dda0511cd21ed264d045b88009099f725f872047b30a8481f84d42a
+  data.tar.gz: 49d8631628c8332c35aee980eeb90003331513b449d7f21ac34acecae1961446
 SHA512:
-  metadata.gz: f760735aa2fffb0680e00f5b8bc771a9d6ff22bcdb4e13f7bbba0753ae5390ac35d6b9ecc49a388e3290ad2d53fe392e5f5b9a1fc73d1c6f6a52887f93a6ccbc
-  data.tar.gz: 17ff605c14abb3363494062533d33d52f0c64b53c01e9f8a700ecf8d8d22dcdb5f0e55b2be6db9a34b1233d9b2da65dc85ce9227df8d148d49dd5d33492686f8
+  metadata.gz: 93930a13103dbc555bde06200b8532ac4355e0f34a17a947a8bd0e5484c2ee3741eabb03c06946a2445e287f7ebd55bb79c4176ad993171beea9127ace7dbdcf
+  data.tar.gz: 34d73a2753a0505995f47b547dbb120cc156dc25a71e3cadefaa1f367e43bed8cd38896a41777a3d399a17cd4add4501f64d4b4edea8e919944c520a85819148

data/.semaphore/semaphore.yml

@@ -1347,6 +1347,44 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
+    - name: Ruby 3.0.3 for psych-3
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.3
+      - name: GEMSET
+        value: psych-3
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/psych-3.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+      - "./support/bundler_wrapper exec rake test:failure"
+    - name: Ruby 3.0.3 for psych-4
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.3
+      - name: GEMSET
+        value: psych-4
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/psych-4.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+      - "./support/bundler_wrapper exec rake test:failure"
     - name: Ruby 3.0.3 for que
       env_vars:
       - *2
@@ -1518,7 +1556,7 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-- name: Ruby 3.1.0
+- name: Ruby 3.1.1
   dependencies:
   - Validation
   task:
@@ -1532,14 +1570,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.1.0 for no_dependencies
+    - name: Ruby 3.1.1 for no_dependencies
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: no_dependencies
       - name: BUNDLE_GEMFILE
@@ -1551,9 +1589,9 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-- name: Ruby 3.1.0 - Gems
+- name: Ruby 3.1.1 - Gems
   dependencies:
-  - Ruby 3.1.0
+  - Ruby 3.1.1
   task:
     prologue:
       commands:
@@ -1565,14 +1603,14 @@ blocks:
       - "./support/bundler_wrapper exec rake extension:install"
     epilogue: *1
     jobs:
-    - name: Ruby 3.1.0 for capistrano2
+    - name: Ruby 3.1.1 for capistrano2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: capistrano2
       - name: BUNDLE_GEMFILE
@@ -1584,14 +1622,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for capistrano3
+    - name: Ruby 3.1.1 for capistrano3
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: capistrano3
       - name: BUNDLE_GEMFILE
@@ -1603,14 +1641,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for grape
+    - name: Ruby 3.1.1 for grape
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: grape
       - name: BUNDLE_GEMFILE
@@ -1622,14 +1660,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for padrino
+    - name: Ruby 3.1.1 for padrino
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: padrino
       - name: BUNDLE_GEMFILE
@@ -1641,14 +1679,52 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for que
+    - name: Ruby 3.1.1 for psych-3
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.1
+      - name: GEMSET
+        value: psych-3
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/psych-3.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+      - "./support/bundler_wrapper exec rake test:failure"
+    - name: Ruby 3.1.1 for psych-4
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.1
+      - name: GEMSET
+        value: psych-4
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/psych-4.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+      - "./support/bundler_wrapper exec rake test:failure"
+    - name: Ruby 3.1.1 for que
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: que
       - name: BUNDLE_GEMFILE
@@ -1660,14 +1736,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for que_beta
+    - name: Ruby 3.1.1 for que_beta
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: que_beta
       - name: BUNDLE_GEMFILE
@@ -1679,14 +1755,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for rails-6.1
+    - name: Ruby 3.1.1 for rails-6.1
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: rails-6.1
       - name: BUNDLE_GEMFILE
@@ -1698,14 +1774,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for rails-7.0
+    - name: Ruby 3.1.1 for rails-7.0
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: rails-7.0
       - name: BUNDLE_GEMFILE
@@ -1717,14 +1793,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for resque-2
+    - name: Ruby 3.1.1 for resque-2
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: resque-2
       - name: BUNDLE_GEMFILE
@@ -1736,14 +1812,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for sequel
+    - name: Ruby 3.1.1 for sequel
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: sequel
       - name: BUNDLE_GEMFILE
@@ -1755,14 +1831,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for sinatra
+    - name: Ruby 3.1.1 for sinatra
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: sinatra
       - name: BUNDLE_GEMFILE
@@ -1774,14 +1850,14 @@ blocks:
       commands:
       - "./support/bundler_wrapper exec rake test"
       - "./support/bundler_wrapper exec rake test:failure"
-    - name: Ruby 3.1.0 for webmachine
+    - name: Ruby 3.1.1 for webmachine
       env_vars:
       - *2
       - *3
       - *4
       - *5
       - name: RUBY_VERSION
-        value: 3.1.0
+        value: 3.1.1
       - name: GEMSET
         value: webmachine
       - name: BUNDLE_GEMFILE

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.26
+
+### Removed
+
+- [56ec42ae](https://github.com/appsignal/appsignal-ruby/commit/56ec42ae634c5675b1769963688a8f3f22715e0e) patch - Remove Moped support as it is no longer the official Ruby Mongo driver and it's been unmaintained for 7 years.
+
+### Fixed
+
+- [991ca18d](https://github.com/appsignal/appsignal-ruby/commit/991ca18dfc5b05cf34841f84c17d821a17bf7a84) patch - Fix runtime errors on YAML load with older psych versions (`< 4`) used in combination with newer Ruby version (`3.x`).
+
 ## 3.0.25
 
 ### Added

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler"
 require "rubygems/package_task"
 require "fileutils"
+require "yaml"
 
 VERSION_MANAGERS = {
   :chruby => {
@@ -60,7 +61,7 @@ namespace :build_matrix do
           t["dependencies"] = ["Ruby #{ruby_version}"]
         end
         gemset_for_ruby(ruby, matrix).each do |gem|
-          next if excluded_for_ruby?(gem, ruby)
+          next unless included_for_ruby?(matrix, gem, ruby)
 
           env = matrix["env_vars"] + [
             env_map("RUBY_VERSION", ruby_version),
@@ -134,7 +135,8 @@ namespace :build_matrix do
           out << "./support/bundler_wrapper exec rake extension:install"
           out << "rm -f gemfiles/*.gemfile.lock"
           gemset_for_ruby(ruby, matrix).each do |gem|
-            next if excluded_for_ruby?(gem, ruby)
+            next unless included_for_ruby?(matrix, gem, ruby)
+
             gemfile = gem["gem"]
             out << "echo 'Bundling #{gemfile} in #{ruby_version}'"
             rubygems = gem["rubygems"] || ruby["rubygems"] || defaults["rubygems"]
@@ -175,8 +177,29 @@ namespace :build_matrix do
     end
   end
 
-  def excluded_for_ruby?(gem, ruby)
-    (gem.dig("exclude", "ruby") || []).include?(ruby["ruby"])
+  def included_for_ruby?(matrix, gem, ruby)
+    included_rubies = gem.dig("only", "ruby") || []
+    excluded_rubies = gem.dig("exclude", "ruby") || []
+    if included_rubies.any? && excluded_rubies.any?
+      raise "Both `only` and `exclude` config options for gem `#{gem["gem"]}` are configured. " \
+        "Only use one of the two config options."
+    end
+
+    if included_rubies.any?
+      # If this gem only runs on these specific Ruby version
+      included_rubies.each { |version| check_if_ruby_version_exists!(matrix, version) }
+      return true if included_rubies.include?(ruby["ruby"])
+    else
+      # If this gem is excluded from running on this Ruby version
+      excluded_rubies.each { |version| check_if_ruby_version_exists!(matrix, version) }
+      return true unless excluded_rubies.include?(ruby["ruby"])
+    end
+  end
+
+  def check_if_ruby_version_exists!(matrix, ruby_version)
+    return if matrix["ruby"].find { |ruby| ruby["ruby"] == ruby_version }
+
+    raise "Ruby version `#{ruby_version}` is not known by the build matrix."
   end
 end
 

data/build_matrix.yml

@@ -189,7 +189,7 @@ matrix:
     - ruby: "2.6.9"
     - ruby: "2.7.5"
     - ruby: "3.0.3"
-    - ruby: "3.1.0"
+    - ruby: "3.1.1"
     - ruby: "jruby-9.2.19.0"
       gems: "minimal"
       env_vars:
@@ -201,76 +201,119 @@ matrix:
     - gem: "capistrano3"
     - gem: "grape"
     - gem: "padrino"
+    - gem: "psych-3"
+      only:
+        ruby:
+          - "3.0.3"
+          - "3.1.1"
+    - gem: "psych-4"
+      only:
+        ruby:
+          - "3.0.3"
+          - "3.1.1"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
       bundler: "1.17.3"
-      exclude:
+      only:
         ruby:
-          - "2.6.9"
-          - "2.7.5"
-          - "3.0.3"
-          - "3.1.0"
+          - "2.0.0-p648"
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
     - gem: "rails-4.2"
       bundler: "1.17.3"
-      exclude:
+      only:
         ruby:
-          - "2.6.9"
-          - "2.7.5"
-          - "3.0.3"
-          - "3.1.0"
+          - "2.0.0-p648"
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
     - gem: "rails-5.0"
-      exclude:
-        ruby:
-          - "3.0.3"
-          - "3.1.0"
-    - gem: "rails-5.1"
-      exclude:
-        ruby:
-          - "3.0.3"
-          - "3.1.0"
-    - gem: "rails-5.2"
-      exclude:
-        ruby:
-          - "3.0.3"
-          - "3.1.0"
-    - gem: "rails-6.0"
-      exclude:
+      only:
         ruby:
+          - "2.0.0-p648"
           - "2.1.10"
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
-          - "3.1.0"
-    - gem: "rails-6.1"
-      exclude:
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
+    - gem: "rails-5.1"
+      only:
         ruby:
+          - "2.0.0-p648"
           - "2.1.10"
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
-    - gem: "rails-7.0"
-      exclude:
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
+    - gem: "rails-5.2"
+      only:
         ruby:
+          - "2.0.0-p648"
           - "2.1.10"
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
+          - "2.7.5"
+          - "jruby-9.2.19.0"
+    - gem: "rails-6.0"
+      only:
+        ruby:
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
           - "jruby-9.2.19.0"
+    - gem: "rails-6.1"
+      only:
+        ruby:
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.1"
+          - "jruby-9.2.19.0"
+    - gem: "rails-7.0"
+      only:
+        ruby:
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.1"
     - gem: "resque-1"
       bundler: "1.17.3"
-      exclude:
+      only:
         ruby:
-          - "3.0.3"
-          - "3.1.0"
+          - "2.0.0-p648"
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
     - gem: "resque-2"
     - gem: "sequel"
     - gem: "sequel-435"
-      exclude:
+      only:
         ruby:
-          - "3.0.3"
-          - "3.1.0"
+          - "2.0.0-p648"
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
+          - "2.6.9"
+          - "2.7.5"
     - gem: "sinatra"
     - gem: "webmachine"

data/gemfiles/psych-3.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "psych", "~> 3.3"
+
+gemspec :path => "../"

data/gemfiles/psych-4.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "psych", "~> 4.0"
+
+gemspec :path => "../"

data/lib/appsignal/config.rb

@@ -376,7 +376,7 @@ module Appsignal
     def load_from_disk
       return if !config_file || !File.exist?(config_file)
 
-      read_options = RUBY_VERSION >= "3.1.0" ? { :aliases => true } : {}
+      read_options = YAML::VERSION >= "4.0.0" ? { :aliases => true } : {}
       configurations = YAML.load(ERB.new(IO.read(config_file)).result, **read_options)
       config_for_this_env = configurations[env]
       if config_for_this_env

data/lib/appsignal/helpers/instrumentation.rb

@@ -178,7 +178,7 @@ module Appsignal
       #
       # @example Add more metadata to transaction
       #   Appsignal.send_error(e) do |transaction|
-      #     transaction.params(:search_query => params[:search_query])
+      #     transaction.params = { :search_query => params[:search_query] }
       #     transaction.set_action("my_action_name")
       #     transaction.set_tags(:key => "value")
       #     transaction.set_namespace("my_namespace")
@@ -258,7 +258,7 @@ module Appsignal
       #   begin
       #     raise "oh no!"
       #   rescue => e
-      #     Appsignal.set_error(error)
+      #     Appsignal.set_error(e)
       #   end
       #   # Manually completing the transaction here.
       #   # Manually stopping AppSignal here
@@ -275,7 +275,7 @@ module Appsignal
       #
       # @example Add more metadata to transaction
       #   Appsignal.set_error(e) do |transaction|
-      #     transaction.params(:search_query => params[:search_query])
+      #     transaction.params = { :search_query => params[:search_query] }
       #     transaction.set_action("my_action_name")
       #     transaction.set_tags(:key => "value")
       #     transaction.set_namespace("my_namespace")

data/lib/appsignal/integrations/sidekiq.rb

@@ -158,7 +158,7 @@ module Appsignal
 
       # Based on: https://github.com/mperham/sidekiq/blob/63ee43353bd3b753beb0233f64865e658abeb1c3/lib/sidekiq/api.rb#L403-L412
       def safe_load(content, default)
-        if RUBY_VERSION >= "3.1.0"
+        if YAML::VERSION >= "4.0.0"
           yield(*YAML.unsafe_load(content))
         else
           yield(*YAML.load(content))

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.0.25".freeze
+  VERSION = "3.0.26".freeze
 end

data/spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb

@@ -2,7 +2,7 @@ describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   let(:klass)     { Appsignal::EventFormatter::ElasticSearch::SearchFormatter }
   let(:formatter) { klass.new }
 
-  it "should register query.moped" do
+  it "should register search.elasticsearch" do
     expect(
       Appsignal::EventFormatter.registered?("search.elasticsearch", klass)
     ).to be_truthy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.25
+  version: 3.0.26
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -177,6 +177,8 @@ files:
 - gemfiles/grape.gemfile
 - gemfiles/no_dependencies.gemfile
 - gemfiles/padrino.gemfile
+- gemfiles/psych-3.gemfile
+- gemfiles/psych-4.gemfile
 - gemfiles/que.gemfile
 - gemfiles/que_beta.gemfile
 - gemfiles/rails-3.2.gemfile
@@ -213,7 +215,6 @@ files:
 - lib/appsignal/event_formatter/elastic_search/search_formatter.rb
 - lib/appsignal/event_formatter/faraday/request_formatter.rb
 - lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb
-- lib/appsignal/event_formatter/moped/query_formatter.rb
 - lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
@@ -312,7 +313,6 @@ files:
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb
@@ -465,7 +465,6 @@ test_files:
 - spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb
-- spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb
 - spec/lib/appsignal/event_formatter/sequel/sql_formatter_spec.rb
 - spec/lib/appsignal/event_formatter_spec.rb
 - spec/lib/appsignal/extension/jruby_spec.rb

data/lib/appsignal/event_formatter/moped/query_formatter.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  class EventFormatter
-    # @api private
-    module Moped
-      class QueryFormatter
-        def format(payload)
-          return unless payload[:ops]
-          return if payload[:ops].empty?
-
-          op = payload[:ops].first
-          case op.class.to_s
-          when "Moped::Protocol::Command"
-            [
-              "Command", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, true, :mongodb)
-              }.inspect
-            ]
-          when "Moped::Protocol::Query"
-            [
-              "Query", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags,
-                :limit    => op.limit,
-                :skip     => op.skip,
-                :fields   => op.fields
-              }.inspect
-            ]
-          when "Moped::Protocol::Delete"
-            [
-              "Delete", {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::Insert"
-            [
-              "Insert", {
-                :database   => op.full_collection_name,
-                :documents  => sanitize(op.documents, true, :mongodb),
-                :count      => op.documents.count,
-                :flags      => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::Update"
-            [
-              "Update",
-              {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :update   => sanitize(op.update, true, :mongodb),
-                :flags    => op.flags
-              }.inspect
-            ]
-          when "Moped::Protocol::KillCursors"
-            [
-              "KillCursors",
-              { :number_of_cursor_ids => op.number_of_cursor_ids }.inspect
-            ]
-          else
-            [
-              op.class.to_s.sub("Moped::Protocol::", ""),
-              { :database => op.full_collection_name }.inspect
-            ]
-          end
-        end
-
-        private
-
-        def sanitize(params, only_top_level, key_sanitizer)
-          Appsignal::Utils::QueryParamsSanitizer.sanitize \
-            params, only_top_level, key_sanitizer
-        end
-      end
-    end
-  end
-end
-
-Appsignal::EventFormatter.register(
-  "query.moped",
-  Appsignal::EventFormatter::Moped::QueryFormatter
-)

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -1,118 +0,0 @@
-describe Appsignal::EventFormatter::Moped::QueryFormatter do
-  let(:klass) { Appsignal::EventFormatter::Moped::QueryFormatter }
-  let(:formatter) { klass.new }
-
-  it "should register query.moped" do
-    expect(Appsignal::EventFormatter.registered?("query.moped", klass)).to be_truthy
-  end
-
-  describe "#format" do
-    let(:payload) { { :ops => [op] } }
-    subject { formatter.format(payload) }
-
-    context "without ops in the payload" do
-      let(:payload) { {} }
-
-      it { is_expected.to be_nil }
-    end
-
-    context "when ops is nil in the payload" do
-      let(:payload) { { :ops => nil } }
-
-      it { is_expected.to be_nil }
-    end
-
-    context "Moped::Protocol::Command" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "query" => { "_id" => "abc" } },
-          :class                => double(:to_s => "Moped::Protocol::Command")
-        )
-      end
-
-      it { is_expected.to eq ["Command", '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
-    end
-
-    context "Moped::Protocol::Query" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :flags                => [],
-          :limit                => 0,
-          :skip                 => 0,
-          :fields               => nil,
-          :class                => double(:to_s => "Moped::Protocol::Query")
-        )
-      end
-
-      it { is_expected.to eq ["Query", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
-    end
-
-    context "Moped::Protocol::Delete" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :flags                => [],
-          :class                => double(:to_s => "Moped::Protocol::Delete")
-        )
-      end
-
-      it { is_expected.to eq ["Delete", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::Insert" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :flags                => [],
-          :documents            => [
-            { "_id" => "abc", "events" => { "foo" => [{ "bar" => "baz" }] } },
-            { "_id" => "def", "events" => { "foo" => [{ "baz" => "bar" }] } }
-          ],
-          :class                => double(:to_s => "Moped::Protocol::Insert")
-        )
-      end
-
-      it { is_expected.to eq ["Insert", '{:database=>"database.collection", :documents=>[{"_id"=>"?", "events"=>"?"}], :count=>2, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::Update" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :selector             => { "_id" => "abc" },
-          :update               => { "user.name" => "James Bond" },
-          :flags                => [],
-          :class                => double(:to_s => "Moped::Protocol::Update")
-        )
-      end
-
-      it { is_expected.to eq ["Update", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
-    end
-
-    context "Moped::Protocol::KillCursors" do
-      let(:op) do
-        double(
-          :number_of_cursor_ids => 2,
-          :class                => double(:to_s => "Moped::Protocol::KillCursors")
-        )
-      end
-
-      it { is_expected.to eq ["KillCursors", "{:number_of_cursor_ids=>2}"] }
-    end
-
-    context "Moped::Protocol::Other" do
-      let(:op) do
-        double(
-          :full_collection_name => "database.collection",
-          :class                => double(:to_s => "Moped::Protocol::Other")
-        )
-      end
-
-      it { is_expected.to eq ["Other", '{:database=>"database.collection"}'] }
-    end
-  end
-end