rack-logstasher 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5094e6e9fe586e95d7dd08699e18c62d0019dee66ad0da6e2da1d6ac6b2d024
-  data.tar.gz: 6bebaffb4cb498b604a78fc3a3505144578c169fd158f464fb321a16201e1668
+  metadata.gz: 0d877ce60ae84d0a7532df7b8e89c8947fc7fcb4d6bd3733894c5761bc877a7c
+  data.tar.gz: 19b5da86c58508f8031737a65f4244ae7f1d91c4451a0587ae7559d0fa43b3d3
 SHA512:
-  metadata.gz: 252b77f49678629284adf356cdf662241ec7fcad6f4f773c8c974b51fab8d8c81d814ae32a252deffeb6eb5c48f8ebfcb3a74f8faa976cf45b4f296b48ad9852
-  data.tar.gz: 19451f78071d21aeb47807d6a11c9aaa7a82c8a61f3872db8fc31e30eb26469af1abcfbe332bc46cb433e69076bc184b01c9df67f43d9bdb7cb2a1a409212571
+  metadata.gz: 4607fc05644c2a62c82f326aa933f832f11f788a1ba462f5cd4aa48beb721544347d9f9ea3d2f59969769a1c2403da6fdbdfaa35da0238e9c24f6fcb951c0b00
+  data.tar.gz: d47fe6f832f458d24e4ad6cf91d3235a93ccd5e3c311c6d16d8af3e13a64bf6abe08ee359e5c90a57d1419965e8517fd26b57c0fd1c5dab4906a99f0a66bb6fa

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+on: [push, pull_request]
+
+jobs:
+  test_matrix:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [ 2.7, '3.0', 3.1 ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake
+
+  # Branch protection rules cannot directly depend on status checks from matrix jobs.
+  # So instead we define `test` as a dummy job which only runs after the preceding `test_matrix` checks have passed.
+  # Solution inspired by: https://github.community/t/status-check-for-a-matrix-jobs/127354/3
+  test:
+    needs: test_matrix
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "All matrix tests have passed 🚀"
+
+  publish:
+    needs: test
+    if: ${{ github.ref == 'refs/heads/main' }}
+    permissions:
+      contents: write
+    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yaml@main
+    secrets:
+      GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,19 @@
+inherit_gem:
+  rubocop-govuk:
+    - config/default.yml
+    - config/rake.yml
+    - config/rspec.yml
+
+inherit_mode:
+  merge:
+    - Exclude
+
+# **************************************************************
+# TRY NOT TO ADD OVERRIDES IN THIS FILE
+#
+# This repo is configured to follow the RuboCop GOV.UK styleguide.
+# Any rules you override here will cause this repo to diverge from
+# the way we write code in all other GOV.UK repos.
+#
+# See https://github.com/alphagov/rubocop-govuk/blob/main/CONTRIBUTING.md
+# **************************************************************

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.7.6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.1.0
+
+- Require Ruby 2.7 and greater
+
+# 1.0.2
+
+- Fix logging error where Rack uses the system monotonic clock.
+
 # 1.0.1
 
 - *Changes logging format* to drop the "@fields" prefix and rename "@tags" to "tags".

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in rack-logstasher.gemspec
 gemspec

data/{LICENSE.txt → LICENCE}

@@ -1,6 +1,6 @@
-Copyright (c) 2013 Alex Tomlins
+The MIT License (MIT)
 
-MIT License
+Copyright (C) 2013 Crown Copyright (Government Digital Service)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -29,3 +29,7 @@ Add this to the middleware stack.  e.g.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Licence
+
+[MIT License](LICENCE)

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
-
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task :default => :spec
+task default: %i[rubocop spec]

data/lib/rack/logstasher/logger.rb

@@ -1,5 +1,5 @@
-require 'rack/common_logger'
-require 'logstash/event'
+require "rack/common_logger"
+require "logstash/event"
 
 module Rack
   module Logstasher
@@ -10,20 +10,20 @@ module Rack
         @extra_response_headers = opts[:extra_response_headers] || {}
       end
 
-      private
+    private
 
       def log(env, status, response_headers, began_at)
-        now = Time.now
+        now = Utils.clock_time
 
         data = {
-          :method => env["REQUEST_METHOD"],
-          :path => env["PATH_INFO"],
-          :query_string => env["QUERY_STRING"],
-          :status => status.to_i,
-          :duration => duration_in_ms(began_at, now).round(2),
-          :remote_addr => env['REMOTE_ADDR'],
-          :request => request_line(env),
-          :length => extract_content_length(response_headers)
+          method: env["REQUEST_METHOD"],
+          path: env["PATH_INFO"],
+          query_string: env["QUERY_STRING"],
+          status: status.to_i,
+          duration: duration_in_ms(began_at, now).round(2),
+          remote_addr: env["REMOTE_ADDR"],
+          request: request_line(env),
+          length: extract_content_length(response_headers),
         }
 
         @extra_request_headers.each do |header, log_key|
@@ -39,8 +39,8 @@ module Rack
           end
         end
 
-        event = LogStash::Event.new(data.merge('tags' => ['request']))
-        msg = event.to_json + "\n"
+        event = LogStash::Event.new(data.merge("tags" => %w[request]))
+        msg = "#{event.to_json}\n"
         if @logger.respond_to?(:write)
           @logger.write(msg)
         else
@@ -53,12 +53,11 @@ module Rack
       end
 
       def request_line(env)
-        line = "#{env["REQUEST_METHOD"]} #{env["SCRIPT_NAME"]}#{env['PATH_INFO']}"
-        line << "?#{env["QUERY_STRING"]}" if env["QUERY_STRING"] and ! env["QUERY_STRING"].empty?
-        line << " #{env["SERVER_PROTOCOL"]}"
+        line = "#{env['REQUEST_METHOD']} #{env['SCRIPT_NAME']}#{env['PATH_INFO']}"
+        line << "?#{env['QUERY_STRING']}" if env["QUERY_STRING"] && !env["QUERY_STRING"].empty?
+        line << " #{env['SERVER_PROTOCOL']}"
         line
       end
-
-    end # Logger
+    end
   end
 end

data/lib/rack/logstasher/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Logstasher
-    VERSION = "1.0.1"
+    VERSION = "1.1.0".freeze
   end
 end

data/rack-logstasher.gemspec

@@ -1,28 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rack/logstasher/version'
+require "rack/logstasher/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-logstasher"
   spec.version       = Rack::Logstasher::VERSION
   spec.authors       = ["GOV.UK Dev"]
   spec.email         = ["govuk-dev@digital.cabinet-office.gov.uk"]
-  spec.description   = %q{Rack middleware to log requests in logstash json event format.  Like the logstasher gem, but for rack apps.}
-  spec.summary       = %q{Rack middleware to log requests in logstash json event format}
+  spec.description   = "Rack middleware to log requests in logstash json event format.  Like the logstasher gem, but for rack apps."
+  spec.summary       = "Rack middleware to log requests in logstash json event format"
   spec.homepage      = "https://github.com/alphagov/rack-logstasher"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.required_ruby_version = ">= 2.7"
+
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w[lib]
 
+  spec.add_dependency "logstash-event", "~> 1.2"
   spec.add_dependency "rack", "~> 2.0"
-  spec.add_dependency "logstash-event"
 
-  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rack-test", "~> 2"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency "rubocop-govuk", "4.8.0"
 end

data/spec/rack/logstasher/logger_spec.rb

@@ -0,0 +1,151 @@
+require "spec_helper"
+require "rack/test"
+require "logger"
+
+require "rack/logstasher"
+
+describe Rack::Logstasher::Logger do
+  include Rack::Test::Methods
+
+  describe "parameters" do
+    def app
+      Rack::Logstasher::Logger.new(
+        proc { |_env| [200, {}, ["Inner app response"]] },
+        Logger.new(tmp_logfile_path),
+      )
+    end
+
+    it "adds request details to the logfile" do
+      get "/foo?bar=baz"
+
+      log_details = JSON.parse(last_log_line)
+
+      expect(log_details["method"]).to eq("GET")
+      expect(log_details["path"]).to eq("/foo")
+      expect(log_details["query_string"]).to eq("bar=baz")
+      expect(log_details["request"]).to eq("GET /foo?bar=baz HTTP/1.0")
+    end
+
+    it "adds a tag of 'request'" do
+      get "/foo?bar=baz"
+
+      log_details = JSON.parse(last_log_line)
+      expect(log_details["tags"]).to eq(%w[request])
+    end
+  end
+
+  describe "duration" do
+    def app
+      Rack::Logstasher::Logger.new(
+        proc do |_env|
+          sleep 0.1
+          [200, {}, ["Inner app response"]]
+        end,
+        Logger.new(tmp_logfile_path),
+      )
+    end
+
+    it "logs request duration" do
+      get "/foo"
+
+      log_details = JSON.parse(last_log_line)
+      expect(log_details["duration"]).to be_within(5).of(100)
+    end
+  end
+
+  describe "HTTP headers" do
+    context "when there are extra request headers" do
+      let(:extra_request_headers) { {} }
+
+      def app
+        Rack::Logstasher::Logger.new(
+          proc { |_env| [200, {}, ["Inner app response"]] },
+          Logger.new(tmp_logfile_path),
+          extra_request_headers: extra_request_headers,
+        )
+      end
+
+      it "adds specified extra request headers to the log under the given key" do
+        extra_request_headers["foo"] = "header_foo"
+        get "/something", {}, { "HTTP_FOO" => "bar" }
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details["header_foo"]).to eq("bar")
+      end
+
+      it "does not add the key if the header is missing" do
+        extra_request_headers["foo"] = "header_foo"
+        get "/something"
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details).not_to have_key("header_foo")
+      end
+
+      it "handles dashes in header name" do
+        extra_request_headers["Varnish-Id"] = "varnish_id"
+        get "/something", {}, { "HTTP_VARNISH_ID" => "1234" }
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details["varnish_id"]).to eq("1234")
+      end
+    end
+
+    context "when there are extra response headers" do
+      let(:extra_response_headers) { {} }
+      let(:inner_response_headers) { {} }
+
+      def app
+        Rack::Logstasher::Logger.new(
+          proc do |_env|
+            headers = inner_response_headers
+            [200, headers, ["Inner app response"]]
+          end,
+          Logger.new(tmp_logfile_path),
+          extra_response_headers: extra_response_headers,
+        )
+      end
+
+      it "adds specified extra response headers to the log under the given key" do
+        extra_response_headers["foo"] = "header_foo"
+        inner_response_headers["Foo"] = "bar"
+        get "/something"
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details["header_foo"]).to eq("bar")
+      end
+
+      it "does not add the key if the header is missing" do
+        extra_response_headers["foo"] = "header_foo"
+        get "/something"
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details).not_to have_key("header_foo")
+      end
+
+      it "handles dashes in header name" do
+        extra_response_headers["X-Cache"] = "cache_status"
+        inner_response_headers["X-Cache"] = "MISS"
+        get "/something"
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details["cache_status"]).to eq("MISS")
+      end
+
+      it "matches header in a case-insensitive fashion" do
+        extra_response_headers["X-CacHe"] = "cache_status"
+        inner_response_headers["x-cAche"] = "MISS"
+        get "/something"
+
+        log_details = JSON.parse(last_log_line)
+
+        expect(log_details["cache_status"]).to eq("MISS")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,10 +3,9 @@
 # Require this file using `require "spec_helper"` to ensure that it is only
 # loaded once.
 
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
+Dir[File.expand_path("support/**/*.rb", __dir__)].sort.each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -17,5 +16,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 end

data/spec/support/logfile_helper.rb

@@ -1,7 +1,7 @@
-require 'tempfile'
+require "tempfile"
 
 module LogfileHelper
-  TMP_LOGFILE = Tempfile.new('rack-logstasher-tmp-log')
+  TMP_LOGFILE = Tempfile.new("rack-logstasher-tmp-log")
 
   def reset_tmp_log
     TMP_LOGFILE.rewind
@@ -18,6 +18,6 @@ module LogfileHelper
 end
 
 RSpec.configuration.include(LogfileHelper)
-RSpec.configuration.before :each do
+RSpec.configuration.before do
   reset_tmp_log
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: logstash-event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: logstash-event
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.0
 description: Rack middleware to log requests in logstash json event format.  Like
   the logstasher gem, but for rack apps.
 email:
@@ -102,20 +102,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- Jenkinsfile
-- LICENSE.txt
+- LICENCE
 - README.md
 - Rakefile
 - lib/rack/logstasher.rb
 - lib/rack/logstasher/logger.rb
 - lib/rack/logstasher/version.rb
 - rack-logstasher.gemspec
-- spec/logger_spec.rb
+- spec/rack/logstasher/logger_spec.rb
 - spec/spec_helper.rb
 - spec/support/logfile_helper.rb
 homepage: https://github.com/alphagov/rack-logstasher
@@ -130,18 +132,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: Rack middleware to log requests in logstash json event format
 test_files:
-- spec/logger_spec.rb
+- spec/rack/logstasher/logger_spec.rb
 - spec/spec_helper.rb
 - spec/support/logfile_helper.rb

data/Jenkinsfile

@@ -1,7 +0,0 @@
-#!/usr/bin/env groovy
-
-library("govuk")
-
-node {
-  govuk.buildProject()
-}

data/spec/logger_spec.rb

@@ -1,136 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-require 'logger'
-
-require 'rack/logstasher'
-
-describe "Logger" do
-  include Rack::Test::Methods
-
-  describe "adding request details to the logfile" do
-    def app
-      Rack::Logstasher::Logger.new(
-        proc {|env|
-          sleep @sleep_time if @sleep_time
-          [200, {}, ["Inner app response"]]
-        },
-        Logger.new(tmp_logfile_path)
-      )
-    end
-
-    it "should add request details to the logfile" do
-      get "/foo?bar=baz"
-
-      log_details = JSON.parse(last_log_line)
-
-      expect(log_details['method']).to eq('GET')
-      expect(log_details['path']).to eq('/foo')
-      expect(log_details['query_string']).to eq('bar=baz')
-      expect(log_details['request']).to eq('GET /foo?bar=baz ') # env['SERVER_PROTOCOL'] is not set under rack-test
-    end
-
-    it "should add request duration" do
-      @sleep_time = 0.1
-      get "/foo"
-
-      log_details = JSON.parse(last_log_line)
-
-      expect(log_details['duration']).to be_within(5).of(100)
-    end
-
-    it "should add a tag of 'request'" do
-      get "/foo?bar=baz"
-
-      log_details = JSON.parse(last_log_line)
-      expect(log_details['tags']).to eq(['request'])
-    end
-
-    describe "adding extra headers to the log" do
-      before :each do
-        @extra_request_headers = {}
-        @extra_response_headers = {}
-      end
-      def app
-        Rack::Logstasher::Logger.new(
-          proc {|env|
-            headers = @inner_response_headers || {}
-            [200, headers, ["Inner app response"]]
-          },
-          Logger.new(tmp_logfile_path),
-          :extra_request_headers => @extra_request_headers,
-          :extra_response_headers => @extra_response_headers
-        )
-      end
-
-      context "extra request headers" do
-        it "should add specified extra request headers to the log under the given key" do
-          @extra_request_headers["foo"] = "header_foo"
-          get "/something", {}, {"HTTP_FOO" => "bar"}
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details['header_foo']).to eq('bar')
-        end
-
-        it "should not add the key if the header is missing" do
-          @extra_request_headers["foo"] = "header_foo"
-          get "/something"
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details).not_to have_key('header_foo')
-        end
-
-        it "should handle dashes in header name" do
-          @extra_request_headers["Varnish-Id"] = "varnish_id"
-          get "/something", {}, {"HTTP_VARNISH_ID" => "1234"}
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details['varnish_id']).to eq('1234')
-        end
-      end
-
-      context "extra response headers" do
-        it "should add specified extra response headers to the log under the given key" do
-          @extra_response_headers["foo"] = "header_foo"
-          @inner_response_headers = {"Foo" => "bar"}
-          get "/something"
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details['header_foo']).to eq('bar')
-        end
-
-        it "should not add the key if the header is missing" do
-          @extra_response_headers["foo"] = "header_foo"
-          get "/something"
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details).not_to have_key('header_foo')
-        end
-
-        it "should handle dashes in header name" do
-          @extra_response_headers["X-Cache"] = "cache_status"
-          @inner_response_headers = {"X-Cache" => "MISS"}
-          get "/something"
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details['cache_status']).to eq('MISS')
-        end
-
-        it "should match header in a case-insensitive fashion" do
-          @extra_response_headers["X-CacHe"] = "cache_status"
-          @inner_response_headers = {"x-cAche" => "MISS"}
-          get "/something"
-
-          log_details = JSON.parse(last_log_line)
-
-          expect(log_details['cache_status']).to eq('MISS')
-        end
-      end
-    end
-  end
-end