newrelic_rpm 3.9.3.241 → 3.9.4.245

data/test/performance/suites/marshalling.rb

@@ -147,19 +147,19 @@ class Marshalling < Performance::TestCase
     events = []
     1000.times do
       event = {
-        :timestamp        => Time.now.to_f,
-        :name             => "Controller/foo/bar",
-        :type             => "Transaction",
-        :duration         => rand,
-        :databaseDuration => rand,
-        :databaseCallCount=> rand,
-        :gcCumulative     => rand,
-        :host             => 'lo-calhost',
-        :color            => 'blue-green',
-        :shape            => 'squarish',
-        :texture          => 'sort of lumpy like a bag of frozen peas'
+        'timestamp'        => Time.now.to_f,
+        'name'             => "Controller/foo/bar",
+        'type'             => "Transaction",
+        'duration'         => rand,
+        'databaseDuration' => rand,
+        'databaseCallCount'=> rand,
+        'gcCumulative'     => rand,
+        'host'             => 'lo-calhost',
+        'color'            => 'blue-green',
+        'shape'            => 'squarish',
+        'texture'          => 'sort of lumpy like a bag of frozen peas'
       }
-      events << [event]
+      events << [event, {}]
     end
     [rand(1000000), events]
   end

data/test/script/path_hash.rb

@@ -46,4 +46,4 @@ path.each do |hop|
   path_hash = xor_result
 end
 
-puts "Final result: 0x#{path_hash.to_s(16).rjust(8, '0')}"
+puts "Final result: #{path_hash.to_s(16).rjust(8, '0')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.9.3.241
+  version: 3.9.4.245
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,8 +246,6 @@ files:
 - bin/newrelic_cmd
 - bin/nrdebug
 - cert/cacert.pem
-- cert/oldsite.pem
-- cert/site.pem
 - config.dot
 - config/database.yml
 - gem-public_cert.pem
@@ -554,6 +552,13 @@ files:
 - test/environments/rails41/config/database.yml
 - test/environments/rails41/config/environment.rb
 - test/environments/rails41/db/schema.rb
+- test/environments/rails42/Gemfile
+- test/environments/rails42/Rakefile
+- test/environments/rails42/config/application.rb
+- test/environments/rails42/config/boot.rb
+- test/environments/rails42/config/database.yml
+- test/environments/rails42/config/environment.rb
+- test/environments/rails42/db/schema.rb
 - test/fixtures/cross_agent_tests/README.md
 - test/fixtures/cross_agent_tests/cat_map.json
 - test/fixtures/cross_agent_tests/labels.json
@@ -683,8 +688,6 @@ files:
 - test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.obfuscated
@@ -695,20 +698,23 @@ files:
 - test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_double_quoted_string.mysql.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_single_quoted_string.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.sql
-- test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.obfuscated
-- test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/README.md
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/end_of_line_comments_with_quotes.obfuscated
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/end_of_line_comments_with_quotes.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_comments_and_quotes.obfuscated
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_comments_and_quotes.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_comments_and_newlines.obfuscated
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_comments_and_newlines.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_end_of_line_comments.obfuscated
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/mixed_quotes_end_of_line_comments.sql
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/quote_delimiters_in_comments.obfuscated
+- test/fixtures/cross_agent_tests/sql_obfuscation/pathological/quote_delimiters_in_comments.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.sql
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.obfuscated
@@ -737,17 +743,6 @@ files:
 - test/fixtures/cross_agent_tests/url_clean.json
 - test/fixtures/cross_agent_tests/url_domain_extraction.json
 - test/fixtures/proc_cpuinfo.txt
-- test/flaky_proxy/Gemfile
-- test/flaky_proxy/README.md
-- test/flaky_proxy/lib/flaky_proxy.rb
-- test/flaky_proxy/lib/flaky_proxy/connection.rb
-- test/flaky_proxy/lib/flaky_proxy/http_message.rb
-- test/flaky_proxy/lib/flaky_proxy/proxy.rb
-- test/flaky_proxy/lib/flaky_proxy/rule.rb
-- test/flaky_proxy/lib/flaky_proxy/rule_set.rb
-- test/flaky_proxy/lib/flaky_proxy/sequence.rb
-- test/flaky_proxy/lib/flaky_proxy/server.rb
-- test/flaky_proxy/script/flaky_proxy
 - test/helpers/exceptions.rb
 - test/helpers/file_searching.rb
 - test/helpers/mongo_metric_builder.rb
@@ -1090,6 +1085,9 @@ files:
 - test/new_relic/version_number_test.rb
 - test/performance/README.md
 - test/performance/lib/performance.rb
+- test/performance/lib/performance/baseline.rb
+- test/performance/lib/performance/baseline_compare_reporter.rb
+- test/performance/lib/performance/baseline_save_reporter.rb
 - test/performance/lib/performance/console_reporter.rb
 - test/performance/lib/performance/hako_client.rb
 - test/performance/lib/performance/hako_reporter.rb
@@ -1100,8 +1098,10 @@ files:
 - test/performance/lib/performance/instrumentor.rb
 - test/performance/lib/performance/json_reporter.rb
 - test/performance/lib/performance/platform.rb
+- test/performance/lib/performance/reporting.rb
 - test/performance/lib/performance/result.rb
 - test/performance/lib/performance/runner.rb
+- test/performance/lib/performance/table.rb
 - test/performance/lib/performance/test_case.rb
 - test/performance/lib/performance/timer.rb
 - test/performance/script/baselines

data/cert/oldsite.pem

@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE1TCCA72gAwIBAgIEQ2DfKzANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMC
-VVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNV
-BAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlmaWNh
-dGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5IFNl
-Y3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5NjkyODcw
-HhcNMDkwMzE4MjEzMjI5WhcNMTEwNDMwMDIyNzExWjBVMRcwFQYDVQQKEw4qLm5l
-d3JlbGljLmNvbTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcw
-FQYDVQQDEw4qLm5ld3JlbGljLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAuBCbjfFuWoIqosv2f9vofqeqZaCsKBWKs799M62BRJgatXM0sPR8T5FJAAYe
-/N5qX3Ei1paM9g8/VKM+w4fpKB9BceE7wwl77vFltgLz0o/IejLodcMDd9Inmt2P
-ax8VLkCxQup+21H3RIYRSyi4TKJeghq+MuDiYKksYZ65YnkCAwEAAaOCAbkwggG1
-MA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MA4GA1UdDwEB/wQEAwIFoDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8vY3JsLmdv
-ZGFkZHkuY29tL2dkczEtMy5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5
-MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3Jl
-cG9zaXRvcnkvMIGABggrBgEFBQcBAQR0MHIwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmdvZGFkZHkuY29tLzBKBggrBgEFBQcwAoY+aHR0cDovL2NlcnRpZmljYXRl
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5L2dkX2ludGVybWVkaWF0ZS5jcnQwHwYD
-VR0jBBgwFoAU/axhMpNsRdbi7oVfmrrndplozOcwJwYDVR0RBCAwHoIOKi5uZXdy
-ZWxpYy5jb22CDG5ld3JlbGljLmNvbTAdBgNVHQ4EFgQUzLBbBJBQ6RF/UpvIuU0H
-C/cE9FgwDQYJKoZIhvcNAQEFBQADggEBAL4q2VVUm/0Zp08zP95dTMDOnoXd+9gX
-OyVhV6O4PXNdlsj7uvpZhtOCdStzIoZPEIYtvjgVfcNhyOg2T0is8u5icDG1uQgq
-dA/gaZ7agWtQlaDfHRHigfDiMF3lQ6by1L+C1i7P+lhEQWGISEAOGisLGW1aFlbs
-ZjJZIIUiej+4QSBAbKsAo72gQ9DOQdrxUCZJoQdQhkjjENg5BbRcxW99M+zykY5o
-HBiXHtXvgcyfZXASfgiW3nSM64QxXs9vd4gfmFNF5wnVHCSOJs5r/NRp9SIciUTq
-YmYKdpFyzxGxZUduYo8z1nGHmPedTxW+RvBbE+gNUtGxhauv8H+J/rc=
------END CERTIFICATE-----

data/cert/site.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEmTCCA4GgAwIBAgICdPYwDQYJKoZIhvcNAQEFBQAwQDELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDkdlb1RydXN0LCBJbmMuMRgwFgYDVQQDEw9HZW9UcnVzdCBTU0wg
-Q0EwHhcNMTEwMzExMTExNTEzWhcNMTMwMzEzMDUyMjU1WjCBrDEpMCcGA1UEBRMg
-M0VrS1FSNFN5Vk5SZjQtdkJaMUZMUEhENnZWNzhLdUoxCzAJBgNVBAYTAlVTMRMw
-EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRYwFAYD
-VQQKEw1OZXcgUmVsaWMgSW5jMRQwEgYDVQQLEwtFbmdpbmVlcmluZzEXMBUGA1UE
-AwwOKi5uZXdyZWxpYy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC4eLGubSgkxRrusVqnI7FmWxp2cS0hjeBFdzjYF3heRWzyerrP74UjbW/3lDV2
-L7mKD6AKL51wPBC+xRtVXI+8SoWLyaO3k9pJEXIiNw8RVl9s9CAiiam3KCgFw+U1
-B8RiZm1xYlbxGAb6XoxJXOx3Sld61ko5ZU/tV5Gs75Vnyt5RxLINoMKl8Dk0C2Z/
-piS8pzoePgTJHEoL/aU9bnCyv2BxdhfIpvBVzvpr79JJ2mo/6gr/ODZWBLIflVPj
-4D+VE4so/Nt5pkTelRsyX8IL/xYb9lIQ+FJqjXksFy+NaR77afNUug3wUXwpkBjc
-KF4TlxTXHadUUURJAyZN/zrlAgMBAAGjggEuMIIBKjAfBgNVHSMEGDAWgBRCeVQb
-Yc1VKz5j1TxIV/Wf+0XOSjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMCcGA1UdEQQgMB6CDioubmV3cmVsaWMuY29tggxuZXdy
-ZWxpYy5jb20wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2d0c3NsLWNybC5nZW90
-cnVzdC5jb20vY3Jscy9ndHNzbC5jcmwwHQYDVR0OBBYEFIGySnbWmSQHcvbson/A
-hDGIuIamMAwGA1UdEwEB/wQCMAAwQwYIKwYBBQUHAQEENzA1MDMGCCsGAQUFBzAC
-hidodHRwOi8vZ3Rzc2wtYWlhLmdlb3RydXN0LmNvbS9ndHNzbC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAHuO8i5vPkZfPhT1a9GCn49J8Ada+faVpGnZ0nE3ufqhD52d
-dZaVyUgft+2s+ksxIGjCwl3X+jeLfOL+dqqt77E1JRAskrCIfFHeQDS/7P6Ch3pE
-zm8uTkMARuRARSi+O0jwTfYH5ApRb7eumgtz8sELg94yPCAKeegrK0zqhNGF6Bnp
-tuSN36tUDtZb1Xy+sz6RzNpQJS/b1KH7e+jbEudctO8b6mP8/5bGoDcWQqPn4YWd
-UAkOShAeRtdc0jsn62VlqDEfQQ16CsmD1Hoh9Mxhwj9rSqwpDSc9f0isJ6xypDhM
-4cNwyeIvhj++8Ir5LdCmWGLcUtNqUs4jK36ph7k=
------END CERTIFICATE-----

data/test/flaky_proxy/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'http_parser.rb'

data/test/flaky_proxy/README.md

@@ -1,140 +0,0 @@
-## flaky_proxy
-
-`flaky_proxy` helps you simulate failures in an HTTP service in a configurable
-way, without modifying the underlying service. Specifically, you can use it as a proxy in front of the collector in order to simulate bad network conditions and see how your agent responds.
-
-## Usage
-
-```
-flaky_proxy -l 8888 -t 8081 <rules_file>
-```
-
-This tells `flaky_proxy` to listen on port 8888 for incoming connections, and
-forward them on to port 8081 of localhost. If you'd like to specify the bind
-host or target host, you can do that too:
-
-```
-flaky_proxy -l localhost:8888 -t collector.newrelic.com:80 <rules_file>
-```
-
-This example will instruct `flaky_proxy` to listen on port 8888 of localhost,
-and forward data to port 80 of `collector.newrelic.com`.
-
-### Rules file format
-
-The `<rules_file>` file is a Ruby file written using a simple DSL, to tell the
-tool how to handle incoming traffic. It consists of a series of `match`
-expressions, each with an accompanying block to be executed in order to
-determine how to deal with a matching HTTP request.
-
-Each incoming HTTP request is evaluated against these match expressions, and the
-first matching expression is chosen. Matching is done by matching the request
-URL of incoming requests against a regular expression given as the first
-argument to `match`.
-
-In the body of the block passed to `match`, you may specify one of the following
-actions:
-
-* `pass` - pass the request through untouched to the target server
-* `respond` - respond with a canned response, without talking to the target server
-* `delay` - sleep for a specified number of seconds before passing the request through to the target server
-* `close` - close the TCP connection without sending a response
-
-Any incoming request that does not match any of the rules specified in your rules file will be treated as an implicit `pass`.
-
-A few examples to make things more concrete:
-
-Close the TCP connection without sending an HTTP response for any request with `foo` in the URL:
-
-```
-match /foo/ { close }
-```
-
-Respond with a 503 status code to 50% of incoming requests matching `metric_data`:
-
-```
-match /metric_data/ do |req|
-  if rand > 0.5
-    pass
-  else
-    respond :status => 503
-  end
-end
-```
-
-Respond with a 200 OK status code and a custom body to requests matching `get_agent_commands`:
-
-```
-match /get_agent_commands/ do |req|
-  respond :body => '{ "error": "bad news" }'
-end
-```
-
-Delay all requests matching `slowdown` by 10 seconds:
-
-```
-match /slowdown/ do
-  delay 10
-end
-```
-
-The rules file will be watched for changes automatically, and the rules will
-be potentially reloaded each time the proxy accepts a new connection.
-
-### Available Actions
-
-#### pass
-
-Pass the request on to the backend server without modification.
-
-#### close
-
-Close the TCP connection from the client before forwarding it on to the backend server.
-
-#### respond(response_spec)
-
-Respond to the client with a canned response, instead of forwarding the request on to the backend server. `response_spec` should be a `Hash` describing the canned response to be sent to the client. Recognized keys in the `response_spec` are:
-
-* `:status` - A `Fixnum` with the HTTP status code. Default: 200.
-* `:headers` - A `Hash` with response headers. Default: the `Content-Length` header will be automatically set based on the response body length.
-* `:body` - A `String` containing the HTTP response body. Default = `''`.
-
-#### delay(amount)
-
-Delay for `amount` seconds before forwarding the request on to the backend server.
-
-### Sequences
-
-Sometimes it's useful to be able to easily express a sequence of actions to be
-taken upon matching a particular rule. To facilitate this, `flaky_proxy`
-supports defining actions using the `sequence` statement.
-
-For example:
-
-```
-seq = sequence do
-  pass
-  respond :status => 503
-  respond :status => 404
-end
-
-match /connect/, seq
-```
-
-This will cause the first request matching `connect` to be passed through to the
-target server, the second to be responded to with a 503 status, and the third to
-be responded to with a 404 status. Any subsequent requests will get the default
-action of being passed through to the target server.
-
-Note that the block passed to `sequence` is evaluated only once, when the rules
-file is loaded, instead of once per request (as a block passed to `match` would
-be).
-
-## Caveats
-
-* Entirely single-threaded and not evented, handles only one connection at a time
-* Almost certainly doesn't handle string encodings correctly
-
-## Bugs? Feature Requests?
-
-Send 'em in! Find Ben Weintraub in the 'Ruby Agent Dev' room, or via email.

data/test/flaky_proxy/lib/flaky_proxy.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-$: << File.expand_path(File.dirname(__FILE__))
-
-require 'logger'
-
-require 'flaky_proxy/server'
-require 'flaky_proxy/connection'
-require 'flaky_proxy/http_message'
-require 'flaky_proxy/rule'
-require 'flaky_proxy/rule_set'
-require 'flaky_proxy/proxy'
-require 'flaky_proxy/sequence'
-
-module FlakyProxy
-  @logger = Logger.new($stderr)
-
-  def self.logger
-    @logger
-  end
-end

data/test/flaky_proxy/lib/flaky_proxy/connection.rb

@@ -1,45 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-module FlakyProxy
-  class Connection
-    def initialize(client_socket, server, rules)
-      @client_socket = client_socket
-      @server_socket = nil
-      @server = server
-      @rules = rules
-    end
-
-    def client_socket
-      @client_socket
-    end
-
-    def server_socket
-      @server_socket ||= @server.open_socket
-    end
-
-    def shutdown
-      @client_socket.close if @client_socket && !@client_socket.closed?
-      @server_socket.close if @server_socket && !@server_socket.closed?
-      @shutdown = true
-    end
-
-    def service
-      loop do
-        service_one
-        break if @shutdown
-      end
-    end
-
-    def service_one
-      request = Request.read_from(client_socket)
-      if request.complete?
-        rule = @rules.match(request)
-        rule.evaluate(request, self)
-      else
-        shutdown
-      end
-    end
-  end
-end

data/test/flaky_proxy/lib/flaky_proxy/http_message.rb

@@ -1,107 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-require 'http/parser'
-require 'webrick'
-
-module FlakyProxy
-  MAXBUF = 10 * 4096 # 40KB
-
-  class HttpMessage
-    def self.read_from(io)
-      msg = self.new
-      msg.read(io)
-      msg
-    end
-
-    attr_reader :raw_data
-
-    def initialize
-      @parser = Http::Parser.new
-      @raw_data = ''
-      @complete = false
-      @parser.on_message_complete = proc do |env|
-        @complete = true
-      end
-    end
-
-    def request_url
-      @parser.request_url if complete?
-    end
-
-    def request_path
-      @parser.request_path if complete?
-    end
-
-    def <<(data)
-      @raw_data << data
-      @parser << data
-    end
-
-    def read(io)
-      loop do
-        return if complete? || io.closed?
-        ready = select([io])
-        if ready && ready.first.include?(io)
-          if io.eof?
-            return
-          else
-            self << io.readpartial(MAXBUF)
-          end
-        end
-      end
-    rescue Errno::ECONNRESET
-      FlakyProxy::Logger.warn("Connection reset by peer when reading from #{io}")
-    end
-
-    def complete?
-      @complete
-    end
-
-    def relay_to(io)
-      io.write(@raw_data)
-    end
-  end
-
-  class Request < HttpMessage
-    def request_method
-      @parser.http_method
-    end
-  end
-
-  class Response < HttpMessage
-    def self.build(options={})
-      defaults = {
-        :status => 200,
-        :headers => {},
-        :body => ''
-      }
-      options = defaults.merge(options)
-      status_line = build_status_line(options[:status])
-      headers = build_headers(options[:body], options[:headers])
-
-      rsp = self.new
-      rsp << status_line
-      rsp << headers
-      rsp << "\r\n"
-      rsp << options[:body]
-      rsp
-    end
-
-    def self.build_status_line(status)
-      status_text = WEBrick::HTTPStatus::StatusMessage[status]
-      "HTTP/1.1 #{status} #{status_text}\r\n"
-    end
-
-    def self.build_headers(body, headers)
-      default_headers = {
-        'Content-Length' => body.bytesize
-      }
-      headers = default_headers.merge(headers)
-      headers.map do |key, value|
-        "#{key}: #{value}\r\n"
-      end.join
-    end
-  end
-end