appydays 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eab73741b9b38b5e71b173859d4a21da866a0ed0d6ac2f2d336c535b60772cad
-  data.tar.gz: c801ace1467194743e5c30c2a08b91f6f735fc61cde35cbc142cae35267eaef0
+  metadata.gz: 6f235dd9ffc485d78888e9cc325dc090dba1f40b8cf4a2cb9e24df2074149520
+  data.tar.gz: a34bed5f98cf79bad2401c94b254a41deb28f7165fb86e5378ec96bec8913b9d
 SHA512:
-  metadata.gz: dad5bd7318ec9bfe7cf73011da874787a9b38dd60305944ea3024473bf3e4eca3aaba59ad0878b6bd37f9bd65c4ffb941e88219a3bfbbd029567d1edc33ebb2d
-  data.tar.gz: 8cfb4768365e9e1c5b1b0052be6b42246bfac6379e712903ef7ff76cf5e882e7d593c65757ac34673704f3b78b0800a25adc6dff578f5e64b75c2a37d6a0daa6
+  metadata.gz: 4e62429beede3533e76c7f245ca3b653c5b702f5fbd64571f7381a49c6975043e8d1c8a37f60a47c3aed7422ec83a8408da66852a47ca3c28840852b2e3feac0
+  data.tar.gz: edb5ebdb0c6b073e8b6c8d4fdbd14d548592fbea901a6e6c0cfc7ef785231158ce94ff8bbbd5496637414c17239e47dd633e65db325c5316e8889d95d07fd564

data/lib/appydays/configurable.rb

@@ -132,6 +132,7 @@ module Appydays::Configurable
       return ->(v) { v.to_s } if default.nil? || default.is_a?(String)
       return ->(v) { v.to_i } if default.is_a?(Integer)
       return ->(v) { v.to_f } if default.is_a?(Float)
+      return ->(v) { v.to_sym } if default.is_a?(Symbol)
       return ->(v) { v.casecmp("true").zero? } if [TrueClass, FalseClass].include?(default.class)
       raise TypeError, "Uncoercable type %p" % [default.class]
     end

data/lib/appydays/loggable/sequel_logger.rb

@@ -17,7 +17,11 @@ class Sequel::Database
     log_each(
       :info,
       proc { args ? "#{message}; #{args.inspect}" : message },
-      proc { ["sequel_log", {message: message, args: args}] },
+      proc do
+        o = {message: message}
+        o[:args] = args unless args.nil?
+        ["sequel_log", o]
+      end,
     )
   end
 
@@ -28,7 +32,7 @@ class Sequel::Database
     log_each(
       lwd && (duration >= lwd) ? :warn : sql_log_level,
       proc { "(#{'%0.6fs' % duration}) #{message}" },
-      proc { ["sequel_query", {duration: duration, query: message}] },
+      proc { ["sequel_query", {duration: duration * 1000, query: message}] },
     )
   end
 

data/lib/appydays/loggable/sidekiq_job_logger.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require "sidekiq"
+require "sidekiq/version"
+require "sidekiq/job_logger"
+
+require "appydays/loggable"
+require "appydays/configurable"
+
+class Appydays::Loggable::SidekiqJobLogger < Sidekiq::JobLogger
+  include Appydays::Configurable
+  include Appydays::Loggable
+  begin
+    require "sidekiq/util"
+    include Sidekiq::Util
+  rescue LoadError
+    require "sidekiq/component"
+    include Sidekiq::Component
+  end
+
+  Sidekiq.logger = self.logger
+
+  def call(item, _queue, &block)
+    start = self.now
+    tags = {
+      job_class: item["class"],
+      job_id: item["jid"],
+      thread_id: self.tid,
+    }
+    self.with_log_tags(tags) do
+      self.call_inner(start, &block)
+    end
+  end
+
+  # Override this to customize when jobs are logged at warn vs. info.
+  # We suggest you subclass SidekiqJobLogger, override this method,
+  # and return a value that is configured.
+  protected def slow_job_seconds
+    return 5.0
+  end
+
+  protected def call_inner(start)
+    yield
+    duration = self.elapsed(start)
+    log_method = duration >= self.slow_job_seconds ? :warn : :info
+    self.logger.send(log_method, "job_done", duration: duration * 1000)
+  rescue StandardError
+    # Do not log the error since it is probably a sidekiq retry error
+    self.logger.error("job_fail", duration: self.elapsed(start) * 1000)
+    raise
+  end
+
+  protected def elapsed(start)
+    (self.now - start).round(3)
+  end
+
+  protected def now
+    return ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+  end
+
+  def self.error_handler(ex, ctx)
+    # ctx looks like:
+    # {
+    # :context=>"Job raised exception",
+    # :job=>
+    #  {"class"=>"App::Async::FailingJobTester",
+    #   "args"=>
+    #    [{"id"=>"e8e03571-9851-4daa-a801-a0b43282f317",
+    #      "name"=>"app.test_failing_job",
+    #      "payload"=>[true]}],
+    #   "retry"=>true,
+    #   "queue"=>"default",
+    #   "jid"=>"cb00c4fe9b2f16b72797d35c",
+    #   "created_at"=>1567811837.798969,
+    #   "enqueued_at"=>1567811837.79901},
+    # :jobstr=>
+    #  "{\"class\":\"App::Async::FailingJobTester\", <etc>"
+    # }
+    job = ctx[:job]
+    # If there was a connection error, you may end up with no job context.
+    # It's very difficult to test this usefully, so it's not tested.
+    unless job
+      self.logger.error("job_error_no_job", {}, ex)
+      return
+    end
+    self.logger.error(
+      "job_error",
+      {
+        job_class: job["class"],
+        job_args: job["args"],
+        job_retry: job["retry"],
+        job_queue: job["queue"],
+        job_id: job["jid"],
+        job_created_at: job["created_at"],
+        job_enqueued_at: job["enqueued_at"],
+      },
+      ex,
+    )
+  end
+
+  def self.death_handler(job, ex)
+    self.logger.error(
+      "job_retries_exhausted",
+      {
+        job_class: job["class"],
+        job_args: job["args"],
+        job_retry: job["retry"],
+        job_queue: job["queue"],
+        job_dead: job["dead"],
+        job_id: job["jid"],
+        job_created_at: job["created_at"],
+        job_enqueued_at: job["enqueued_at"],
+        job_error_message: job["error_message"],
+        job_error_class: job["error_class"],
+        job_failed_at: job["failed_at"],
+        job_retry_count: job["retry_count"],
+      },
+      ex,
+    )
+  end
+end

data/lib/appydays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appydays
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,196 +1,207 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Lithic Tech
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-json_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 'appydays provides support for logging and handling environment variables
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+description: 'appydays provides support for env-based configuration, and common structured
+  logging capabilities
 
-  '
-email:
+'
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- lib/appydays.rb
 - lib/appydays/configurable.rb
 - lib/appydays/dotenviable.rb
 - lib/appydays/loggable.rb
 - lib/appydays/loggable/request_logger.rb
 - lib/appydays/loggable/sequel_logger.rb
+- lib/appydays/loggable/sidekiq_job_logger.rb
 - lib/appydays/loggable/spec_helpers.rb
 - lib/appydays/spec_helpers.rb
 - lib/appydays/version.rb
-- spec/appydays/configurable_spec.rb
-- spec/appydays/dotenviable_spec.rb
-- spec/appydays/loggable_spec.rb
-- spec/spec_helper.rb
-homepage:
+homepage: https://github.com/lithictech/appydays
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -198,15 +209,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
-summary: Provides support for development best practices
+summary: Provides support for env-based configuration, and common structured logging
+  capabilities
 test_files: []

data/lib/appydays.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module Appydays
-  VERSION = "0.1.0"
-end

data/spec/appydays/configurable_spec.rb

@@ -1,197 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Appydays::Configurable do
-  describe "configurable" do
-    it "raises if no block is given" do
-      expect do
-        Class.new do
-          include Appydays::Configurable
-          configurable(:hello)
-        end
-      end.to raise_error(LocalJumpError)
-    end
-
-    describe "setting" do
-      it "creates an attr accessor with the given name and default value" do
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, "zero"
-          end
-        end
-        expect(cls).to have_attributes(knob: "zero")
-      end
-
-      it "pulls the value from the environment" do
-        ENV["ENVTEST_KNOB"] = "one"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:envtest) do
-            setting :knob, "zero"
-          end
-        end
-        expect(cls).to have_attributes(knob: "one")
-      end
-
-      it "can use a custom environment key" do
-        ENV["OTHER_KNOB"] = "two"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, "zero", key: "OTHER_KNOB"
-          end
-        end
-        expect(cls).to have_attributes(knob: "two")
-      end
-
-      it "can convert the value given the converter" do
-        ENV["CONVTEST_KNOB"] = "0"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:convtest) do
-            setting :knob, "", convert: ->(v) { v + v }
-          end
-        end
-        expect(cls).to have_attributes(knob: "00")
-      end
-
-      it "does not run the converter if the default is used" do
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, "0", convert: ->(v) { v + v }
-          end
-        end
-        expect(cls).to have_attributes(knob: "0")
-      end
-
-      it "can use a nil default" do
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, nil
-          end
-        end
-        expect(cls).to have_attributes(knob: nil)
-      end
-
-      it "converts strings to floats if the default is a float" do
-        ENV["FLOATTEST_KNOB"] = "3.2"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:floattest) do
-            setting :knob, 1.5
-          end
-        end
-        expect(cls).to have_attributes(knob: 3.2)
-      end
-
-      it "converts strings to integers if the default is an integer" do
-        ENV["INTTEST_KNOB"] = "5"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:inttest) do
-            setting :knob, 2
-          end
-        end
-        expect(cls).to have_attributes(knob: 5)
-      end
-
-      it "can coerce strings to booleans" do
-        ENV["BOOLTEST_KNOB"] = "TRue"
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:booltest) do
-            setting :knob, false
-          end
-        end
-        expect(cls).to have_attributes(knob: true)
-      end
-
-      it "does not run the converter when using the accessor" do
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:booltest) do
-            setting :knob, 5
-          end
-        end
-        cls.knob = "5"
-        expect(cls).to have_attributes(knob: "5")
-      end
-
-      it "coalesces an empty string to nil" do
-        cls = Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, ""
-          end
-        end
-        expect(cls).to have_attributes(knob: nil)
-      end
-
-      it "errors if the default value is not a supported type" do
-        expect do
-          Class.new do
-            include Appydays::Configurable
-            configurable(:hello) do
-              setting :knob, []
-            end
-          end
-        end.to raise_error(TypeError)
-      end
-
-      it "runs a side effect" do
-        side_effect = []
-        Class.new do
-          include Appydays::Configurable
-          configurable(:hello) do
-            setting :knob, "zero", side_effect: ->(s) { side_effect << s }
-          end
-        end
-        expect(side_effect).to contain_exactly("zero")
-      end
-    end
-
-    it "can reset settings" do
-      cls = Class.new do
-        include Appydays::Configurable
-        configurable(:hello) do
-          setting :knob, 1
-        end
-      end
-      cls.knob = 5
-      expect(cls).to have_attributes(knob: 5)
-      cls.reset_configuration
-      expect(cls).to have_attributes(knob: 1)
-    end
-
-    it "runs after_configure hooks after configuration" do
-      side_effect = []
-      Class.new do
-        include Appydays::Configurable
-        configurable(:hello) do
-          setting :knob, 1
-          after_configured do
-            side_effect << self.knob
-          end
-        end
-      end
-      expect(side_effect).to contain_exactly(1)
-    end
-
-    it "can run after_configured hooks explicitly" do
-      side_effect = []
-      cls = Class.new do
-        include Appydays::Configurable
-        configurable(:hello) do
-          setting :knob, 1
-          after_configured do
-            side_effect << self.knob
-          end
-        end
-      end
-      cls.run_after_configured_hooks
-      expect(side_effect).to contain_exactly(1, 1)
-    end
-  end
-end

data/spec/appydays/dotenviable_spec.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Appydays::Dotenviable do
-  it "loads env files using RACK_ENV" do
-    expect(Dotenv).to receive(:load).with(".env.foo.local", ".env.foo", ".env")
-    described_class.load(env: {"RACK_ENV" => "foo"})
-  end
-
-  it "loads env files using the explicit env" do
-    expect(Dotenv).to receive(:load).with(".env.bar.local", ".env.bar", ".env")
-    described_class.load(rack_env: "bar")
-  end
-
-  it "loads env files with the given default env if no RACK_ENV is defined" do
-    expect(Dotenv).to receive(:load).with(".env.bar.local", ".env.bar", ".env")
-    described_class.load(default_rack_env: "bar", env: {})
-  end
-
-  it "loads env files with RACK_ENV rather than the default, if RACK_ENV is defined" do
-    expect(Dotenv).to receive(:load).with(".env.bar.local", ".env.bar", ".env")
-    described_class.load(default_rack_env: "foo", env: {"RACK_ENV" => "bar"})
-  end
-
-  it "reapplies the original port if one was not loaded" do
-    env = {"PORT" => "123"}
-    expect(Dotenv).to receive(:load)
-    described_class.load(env: env)
-    expect(env).to include("PORT" => "123")
-  end
-
-  it "does not reapply the original port if one was loaded" do
-    env = {"PORT" => "123"}
-    expect(Dotenv).to receive(:load) { env["PORT"] = "456" }
-    described_class.load(env: env)
-    expect(env).to include("PORT" => "456")
-  end
-end

data/spec/appydays/loggable_spec.rb

@@ -1,184 +0,0 @@
-# frozen_string_literal: true
-
-require "appydays/loggable/request_logger"
-
-RSpec.describe Appydays::Loggable do
-  it "can set the default log level" do
-    expect(SemanticLogger).to receive(:default_level=).with("trace")
-    described_class.default_level = "trace"
-  end
-
-  it "can look up the logger for an object for a non-Loggable" do
-    cls = Class.new
-    cls_logger = described_class[cls]
-    inst_logger = described_class[cls.new]
-    expect(cls_logger).to be_a(SemanticLogger::Logger)
-    expect(inst_logger).to be_a(SemanticLogger::Logger)
-    expect(cls_logger.name).to eq(inst_logger.name)
-  end
-
-  it "can look up the logger for an object for a Loggable" do
-    cls = Class.new do
-      include Appydays::Loggable
-    end
-    cls_logger = described_class[cls]
-    inst = cls.new
-    inst_logger = described_class[inst]
-    expect(cls_logger).to be(inst_logger)
-    expect(cls.logger).to be(inst.logger)
-  end
-
-  it "adds logger methods" do
-    cls = Class.new do
-      include Appydays::Loggable
-    end
-    inst = cls.new
-    expect(cls.logger).to be_a(SemanticLogger::Logger)
-    expect(inst.logger).to be_a(SemanticLogger::Logger)
-  end
-
-  describe "custom formatting" do
-    it "combines :payload, :tags, and :named_tags into :context" do
-      logger1 = described_class["spec-helper-test"]
-
-      lines = capture_logs_from(logger1, formatter: :json) do
-        SemanticLogger.tagged("tag1", "tag2") do
-          SemanticLogger.named_tagged(nt1: 1, nt2: 2) do
-            logger1.error("hello", opt1: 1, opt2: 2)
-          end
-        end
-      end
-      j = JSON.parse(lines[0])
-      expect(j).to include("context")
-      expect(j["context"]).to eq(
-        "_tags" => ["tag1", "tag2"],
-        "nt1" => 1,
-        "nt2" => 2,
-        "opt1" => 1,
-        "opt2" => 2,
-      )
-    end
-  end
-
-  describe "spec helpers" do
-    logger1 = described_class["spec-helper-test"]
-
-    it "can capture log lines to a logger" do
-      lines = capture_logs_from(logger1) do
-        logger1.error("hello there")
-      end
-      expect(lines).to have_a_line_matching(/hello there/)
-    end
-
-    it "can capture log lines to multiple loggers" do
-      lines = capture_logs_from(logger1) do
-        logger1.error("hello there")
-      end
-      expect(lines).to have_a_line_matching(/hello there/)
-    end
-
-    it "can filter logs below a level" do
-      lines = capture_logs_from(logger1, level: :error) do
-        logger1.warn("hello there")
-      end
-      expect(lines).to be_empty
-    end
-
-    it "can specify the formatter" do
-      lines = capture_logs_from(logger1, formatter: :json) do
-        logger1.warn("hello there")
-      end
-      expect(lines).to have_a_line_matching(/"message":"hello there"/)
-
-      lines = capture_logs_from(logger1, formatter: :color) do
-        logger1.warn("hello there")
-      end
-      expect(lines).to have_a_line_matching(/-- hello there/)
-    end
-
-    it "sets and restores the level of all appenders" do
-      logger1.level = :info
-      other_appender = SemanticLogger.add_appender(io: StringIO.new, level: :trace)
-      capture_logs_from(logger1, level: :trace) do
-        expect(logger1.level).to eq(:trace)
-        expect(other_appender.level).to eq(:fatal)
-      end
-      expect(logger1.level).to eq(:info)
-      expect(other_appender.level).to eq(:trace)
-      SemanticLogger.remove_appender(other_appender)
-    end
-  end
-
-  describe Appydays::Loggable::RequestLogger do
-    def run_app(app, opts: {}, loggers: [], env: {}, cls: Appydays::Loggable::RequestLogger)
-      rl = cls.new(app, **opts.merge(reraise: false))
-      return capture_logs_from(loggers << rl.logger, formatter: :json) do
-        _, _, body = rl.call(env)
-        body&.close
-      end
-    end
-
-    it "logs info about the request" do
-      lines = run_app(proc { [200, {}, ""] })
-      expect(lines).to have_a_line_matching(/"message":"request_finished".*"response_status":200/)
-
-      lines = run_app(proc { [400, {}, ""] })
-      expect(lines).to have_a_line_matching(/"message":"request_finished".*"response_status":400/)
-    end
-
-    it "logs at 599 (or configured value) if something errors" do
-      lines = run_app(proc { raise "testing error" })
-      expect(lines).to have_a_line_matching(/"level":"error".*"response_status":599/)
-      expect(lines).to have_a_line_matching(/"message":"testing error"/)
-    end
-
-    it "logs slow queries at warn" do
-      lines = run_app(proc { [200, {}, ""] }, opts: {slow_request_seconds: 0})
-      expect(lines).to have_a_line_matching(/"level":"warn".*"response_status":200/)
-    end
-
-    it "logs errors at error" do
-      lines = run_app(proc { [504, {}, ""] }, opts: {slow_request_seconds: 0})
-      expect(lines).to have_a_line_matching(/"level":"error".*"response_status":504/)
-    end
-
-    it "adds tags around the execution of the request" do
-      logger = SemanticLogger["testlogger"]
-      lines = run_app(proc do
-                        logger.info("check for tags")
-                        [200, {}, ""]
-                      end,
-                      opts: {slow_request_seconds: 0}, loggers: [logger],)
-      expect(lines).to have_a_line_matching(/"message":"check for tags".*"request_method":/)
-    end
-
-    it "adds subclass tags" do
-      ReqLogger = Class.new(Appydays::Loggable::RequestLogger) do
-        def request_tags(env)
-          return {my_header_tag: env["HTTP_MY_HEADER"]}
-        end
-      end
-      lines = run_app(proc { [200, {}, ""] }, env: {"HTTP_MY_HEADER" => "myval"}, cls: ReqLogger)
-      expect(lines).to have_a_line_matching(/"my_header_tag":"myval"/)
-    end
-
-    it "adds a request id" do
-      lines = run_app(proc { [200, {}, ""] })
-      expect(lines).to have_a_line_matching(/"request_id":"[0-9a-z]{8}-/)
-    end
-
-    it "reads a trace id from headers" do
-      lines = run_app(proc { [200, {}, ""] }, env: {"HTTP_TRACE_ID" => "123xyz"})
-      expect(lines).to have_a_line_matching(/"trace_id":"123xyz"/)
-    end
-
-    it "sets the trace ID header if not set" do
-      env = {}
-      lines = run_app(proc do
-        expect(env).to(include("HTTP_TRACE_ID"))
-        [200, {}, ""]
-      end, env: env,)
-      expect(lines).to have_a_line_matching(/"trace_id":"[0-9a-z]{8}-/)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# See https://github.com/eliotsykes/rspec-rails-examples/blob/master/spec/spec_helper.rb
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-#
-require "appydays/dotenviable"
-Appydays::Dotenviable.load(default_rack_env: "test")
-
-require "rspec"
-require "rspec/json_expectations"
-require "appydays/loggable/spec_helpers"
-require "appydays/spec_helpers"
-require "appydays/configurable"
-
-RSpec.configure do |config|
-  # config.full_backtrace = true
-
-  RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = 600
-
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.mock_with :rspec do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-  config.order = :random
-  Kernel.srand config.seed
-
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-  config.disable_monkey_patching!
-  config.default_formatter = "doc" if config.files_to_run.one?
-
-  config.include(Appydays::Loggable::SpecHelpers)
-  config.include(Appydays::SpecHelpers)
-end