readme-metrics 0.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f7b071458adb5af02621626935bc6d9520bad8e246369a5f500f9037c3ea3b
-  data.tar.gz: f3d313877ae15673722a1c749a5529e971ec17491a7eef639924cf3991419c49
+  metadata.gz: b2495abfb80b4e0d481c89ce9108594a0e46b2526f9548cd5ce8e4be638fd776
+  data.tar.gz: 3da58b3ec731a500dabcba7ac7e86cb72e71c01d093a531e93e060925137f7fd
 SHA512:
-  metadata.gz: be4ec7898257dbd67adf3e27070ea4cb1ee37b0d54d80de7ca2418356bfe3330a0fcdfa8ea3b16fed15afaa03a65ae0c58882f634385f37e76c275a2209f681d
-  data.tar.gz: 76323ca324090a903898b7bd0ff818097272a6270466b4ed9eb58e06897c9becc6cc47264a0e64ee81e4a5a577aa7241ebd09f4d2bda9c3027e914b512b946e9
+  metadata.gz: a341373a18f63d3e5b6736fd5ddd8b17e13db3175474c6ade839129569becbbbe1ec4af9445c0c8bbbe17b53ccbd4b810b0bb4b11e4a1077a725d939fa7146fe
+  data.tar.gz: 5b28d3a9b0000a4642fc9847dab4d5674f1afd1fe888727f0d4dbe910b9f0ed45f757993bb334b026310ddebdee6632c82e9ace8d1e65b9cf7f2124209ece7ab

data/Gemfile

@@ -11,3 +11,5 @@ gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem "standard"
 gem "webmock"
+gem "os"
+gem "uuid"

data/Gemfile.lock

@@ -1,32 +1,35 @@
 PATH
   remote: .
   specs:
-    readme-metrics (0.1.0)
+    readme-metrics (1.1.1)
       httparty (~> 0.18)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.4.4)
     hashdiff (1.0.1)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    mime-types (3.3.1)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2021.1115)
     multi_xml (0.6.0)
+    os (1.1.4)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -65,7 +68,10 @@ GEM
     standard (0.4.7)
       rubocop (~> 0.85.0)
       rubocop-performance (~> 1.6.0)
+    systemu (2.6.5)
     unicode-display_width (1.7.0)
+    uuid (2.3.9)
+      macaddr (~> 1.0)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -76,11 +82,13 @@ PLATFORMS
 
 DEPENDENCIES
   json-schema
+  os
   rack-test
   rake (~> 12.0)
   readme-metrics!
   rspec (~> 3.0)
   standard
+  uuid
   webmock
 
 BUNDLED WITH

data/README.md

@@ -1,7 +1,8 @@
-# readmeio
+# readme-metrics
 
 Track your API metrics within ReadMe.
 
+[![RubyGems](https://img.shields.io/gem/v/readme-metrics)](https://rubygems.org/gems/readme-metrics)
 [![Build](https://github.com/readmeio/metrics-sdks/workflows/ruby/badge.svg)](https://github.com/readmeio/metrics-sdks)
 
 [![](https://d3vv6lp55qjaqc.cloudfront.net/items/1M3C3j0I0s0j3T362344/Untitled-2.png)](https://readme.io)
@@ -24,73 +25,88 @@ from the environment, or you may hardcode them.
 If you're using Warden-based authentication like Devise, you may fetch the
 current_user for a given request from the environment.
 
-### Batching requests
+### SDK Options
 
-By default, the middleware will batch requests to the ReadMe API in groups of
-10. For every 10 requests made to your application, the middleware will make a
-single request to ReadMe. If you wish to override this, provide a
-`buffer_length` option when configuring the middleware.
+Option           | Type             | Description
+-----------------|------------------|---------
+`reject_params`         | Array of strings | If you have sensitive data you'd like to prevent from being sent to the Metrics API via headers, query params or payload bodies, you can specify a list of keys
+to filter via the `reject_params` option. NOTE: cannot be used in conjunction with `allow_only`. You may only specify either `reject_params` or `allow_only` keys, not both.
+`allow_only`        | Array of strings | The inverse of `reject_params`. If included all parameters but those in this list will be redacted. NOTE: cannot be used in conjunction with `reject_params`. You may only specify either `reject_params` or `allow_only` keys, not both.
+`development`      | bool             | Defaults to `false`. When `true`, the log will be marked as a development log. This is great for separating staging or test data from data coming from customers.
+`buffer_length`     | number           | Defaults to `1`. This value should be a number representing the amount of requests to group up before sending them over the network. Increasing this value may increase performance by batching, but will also delay the time until logs show up in the dashboard given the buffer size needs to be reached in order for the logs to be sent.
 
-### Sensitive Data
+### Payload Data
 
-If you have sensitive data you'd like to prevent from being sent to the Metrics
-API via headers, query params or payload bodies, you can specify a list of keys
-to filter via the `reject_params` option. Key-value pairs matching these keys
-will not be included in the request to the Metrics API.
-
-You are also able to specify a set of `allow_only` which should only be sent through.
-Any header or body values not matching these keys will be filtered out and not
-send to the API.
-
-You may only specify either `reject_params` or `allow_only` keys, not both.
+Option              | Required? | Type             | Description
+--------------------|-----------|------------------|----------
+`api_key`           | yes       | string           | API Key used to make the request. Note that this is different from the `readmeAPIKey` described above in the options data. This should be a value from your API that is unique to each of your users.
+`label`             | no        | string           | This will be the user's display name in the API Metrics Dashboard, since it's much easier to remember a name than an API key.
+`email`             | no        | string           | Email of the user that is making the call.
+`log_id`            | no        | string           | A UUIDv4 identifier. If not provided this will be automatically generated for you. Providing your own `log_id` is useful if you want to know the URL of the log in advance, i.e. `{your_base_url}/logs/{your_log_id}`.
+`ignore`            | no        | bool           | A flag that when set to `true` will suppress sending the log.
 
 ### Rails
 
 ```ruby
-# application.rb
+# config/environments/development.rb or config/environments/production.rb
 require "readme/metrics"
 
-options = {
-  api_key: "YOUR_API_KEY",
+sdk_options = {
+  api_key: "<<apiKey>>",
   development: false,
   reject_params: ["not_included", "dont_send"],
   buffer_length: 5,
 }
 
-config.middleware.use Readme::Metrics, options do |env|
-  current_user = env['warden'].authenticate(scope: :current_user)
+config.middleware.use Readme::Metrics, sdk_options do |env|
+  current_user = env['warden'].authenticate
 
-  {
-    id: current_user.id
-    label: current_user.full_name,
+  payload_data = current_user.present? ? {
+    api_key: current_user.api_key, # Not the same as the ReadMe API Key
+    label: current_user.name,
     email: current_user.email
+  } : {
+    api_key: "guest",
+    label: "Guest User",
+    email: "guest@example.com"
   }
+
+  payload_data
 end
 ```
 
-### Rack::Builder
+### Rack
 
 ```ruby
-Rack::Builder.new do |builder|
-  options = {
-    api_key: "YOUR_API_KEY",
-    development: false,
-    reject_params: ["not_included", "dont_send"]
-  }
+# config.ru
+sdk_options = {
+  api_key: "<<apiKey>>",
+  development: false,
+  reject_params: ["not_included", "dont_send"]
+}
 
-  builder.use Readme::Metrics, options do |env|
+use Readme::Metrics, sdk_options do |env|
     {
-      id: "my_application_id"
-      label: "My Application",
-      email: "my.application@example.com"
+      api_key: "owlbert_api_key"
+      label: "Owlbert",
+      email: "owlbert@example.com",
+      log_id: SecureRandom.uuid
     }
-  end
-  builder.run your_app
 end
+
+run YourApp.new
 ```
 
-## License
+### Sample Applications
+
+- [Rails](https://github.com/readmeio/metrics-sdk-rails-sample)
+- [Rack](https://github.com/readmeio/metrics-sdk-racks-sample)
+- [Sinatra](https://github.com/readmeio/metrics-sdk-sinatra-example)
 
-[View our license here](https://github.com/readmeio/metrics-sdks/tree/master/packages/ruby/LICENSE)
+### Contributing
 
+Ensure you are running the version of ruby specified in the `Gemfile.lock`; use `rvm` to easy manage ruby versions. Run `bundle` to install dependencies, `rake` or `rspec` to ensure tests pass, and `bundle exec standardrb` to lint the code.
+
+## License
 
+[View our license here](https://github.com/readmeio/metrics-sdks/tree/main/packages/ruby/LICENSE)

data/SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If there are any vulnerabilities in `readme-metrics`, don't hesitate to _report them_.
+
+Please email security@readme.io and describe what you've found.
+
+- If you have a fix, explain or attach it.
+- In the near time, expect a reply with the required steps. Also, there may be a demand for a pull request which include the fixes.
+
+> You should not disclose the vulnerability publicly if you haven't received an answer in some weeks. If the vulnerability is rejected, you may post it publicly within some hour of rejection, unless the rejection is withdrawn within that time period. After the vulnerability has been fixed, you may disclose the vulnerability details publicly over some days.

data/lib/readme/content_type_helper.rb

@@ -0,0 +1,17 @@
+module Readme
+  module ContentTypeHelper
+    # Assumes the includer has a `content_type` method defined.
+
+    JSON_MIME_TYPES = [
+      "application/json",
+      "application/x-json",
+      "text/json",
+      "text/x-json",
+      "+json"
+    ]
+
+    def json?
+      JSON_MIME_TYPES.any? { |mime_type| content_type.include?(mime_type) }
+    end
+  end
+end

data/lib/readme/errors.rb

@@ -25,7 +25,7 @@ module Readme
         middleware.
 
         Expected a hash with the shape:
-          { id: "unique_id", label: "Your user label", email: "Your user email" }
+          { api_key: "Your user api key", label: "Your user label", email: "Your user email" }
 
         Received value:
           #{result}

data/lib/readme/filter.rb

@@ -1,46 +1,73 @@
-class Filter
-  def self.for(reject: nil, allow_only: nil)
-    if !reject.nil? && !allow_only.nil?
-      raise FilterArgsError
-    elsif !reject.nil?
-      RejectParams.new(reject)
-    elsif !allow_only.nil?
-      AllowOnly.new(allow_only)
-    else
-      None.new
+module Readme
+  class Filter
+    def self.for(reject: nil, allow_only: nil)
+      if !reject.nil? && !allow_only.nil?
+        raise FilterArgsError
+      elsif !reject.nil?
+        RejectParams.new(reject)
+      elsif !allow_only.nil?
+        AllowOnly.new(allow_only)
+      else
+        None.new
+      end
     end
-  end
 
-  class AllowOnly
-    def initialize(filter_values)
-      @filter_values = filter_values
+    def self.redact(rejected_params)
+      rejected_params.each_with_object({}) do |(k, v), hash|
+        # If it's a string then return the length of the redacted field
+        hash[k.to_str] = "[REDACTED#{v.is_a?(String) ? " #{v.length}" : ""}]"
+      end
     end
 
-    def filter(hash)
-      hash.select { |key, _value| @filter_values.include?(key) }
-    end
-  end
+    class AllowOnly
+      def initialize(filter_fields)
+        @allowed_fields = filter_fields
+      end
 
-  class RejectParams
-    def initialize(filter_values)
-      @filter_values = filter_values
+      def filter(hash)
+        allowed_fields = @allowed_fields.map(&:downcase)
+        allowed_params, rejected_params = hash.partition { |key, _value| allowed_fields.include?(key.downcase) }.map(&:to_h)
+
+        allowed_params.merge(Filter.redact(rejected_params))
+      end
+
+      def pass_through?
+        false
+      end
     end
 
-    def filter(hash)
-      hash.reject { |key, _value| @filter_values.include?(key) }
+    class RejectParams
+      def initialize(filter_fields)
+        @rejected_fields = filter_fields
+      end
+
+      def filter(hash)
+        rejected_fields = @rejected_fields.map(&:downcase)
+        rejected_params, allowed_params = hash.partition { |key, _value| rejected_fields.include?(key.downcase) }.map(&:to_h)
+
+        allowed_params.merge(Filter.redact(rejected_params))
+      end
+
+      def pass_through?
+        false
+      end
     end
-  end
 
-  class None
-    def filter(hash)
-      hash
+    class None
+      def filter(hash)
+        hash
+      end
+
+      def pass_through?
+        true
+      end
     end
-  end
 
-  class FilterArgsError < StandardError
-    def initialize
-      msg = "Can only supply either reject_params or allow_only, not both."
-      super(msg)
+    class FilterArgsError < StandardError
+      def initialize
+        msg = "Can only supply either reject_params or allow_only, not both."
+        super(msg)
+      end
     end
   end
 end

data/lib/readme/har/request_serializer.rb

@@ -1,10 +1,11 @@
+require "cgi"
 require "readme/har/collection"
 require "readme/filter"
 
 module Readme
   module Har
     class RequestSerializer
-      def initialize(request, filter = Filter::None.new)
+      def initialize(request, filter = Readme::Filter::None.new)
         @request = request
         @filter = filter
       end
@@ -13,7 +14,7 @@ module Readme
         {
           method: @request.request_method,
           queryString: Har::Collection.new(@filter, @request.query_params).to_a,
-          url: @request.url,
+          url: url,
           httpVersion: @request.http_version,
           headers: Har::Collection.new(@filter, @request.headers).to_a,
           cookies: Har::Collection.new(@filter, @request.cookies).to_a,
@@ -25,6 +26,16 @@ module Readme
 
       private
 
+      def url
+        url = URI(@request.url)
+        headers = @request.headers
+        forward_proto = headers["X-Forwarded-Proto"]
+        forward_host = headers["X-Forwarded-Host"]
+        url.host = forward_host if forward_host.is_a?(String)
+        url.scheme = forward_proto if forward_proto.is_a?(String)
+        url.to_s
+      end
+
       def postData
         if @request.content_type.nil?
           nil
@@ -46,9 +57,37 @@ module Readme
       end
 
       def request_body
+        if @filter.pass_through?
+          pass_through_body
+        elsif is_form_urlencoded?
+          form_urlencoded_body
+        elsif is_json?
+          json_body
+        else
+          @request.body
+        end
+      end
+
+      def is_json?
+        ["application/json", "application/x-json", "text/json", "text/x-json"]
+          .include?(@request.content_type) || @request.content_type.include?("+json")
+      end
+
+      def is_form_urlencoded?
+        @request.content_type == "application/x-www-form-urlencoded"
+      end
+
+      def json_body
         parsed_body = JSON.parse(@request.body)
         Har::Collection.new(@filter, parsed_body).to_h.to_json
-      rescue
+      end
+
+      def form_urlencoded_body
+        parsed_body = CGI.parse(@request.body).transform_values(&:first)
+        Har::Collection.new(@filter, parsed_body).to_h.to_json
+      end
+
+      def pass_through_body
         @request.body
       end
     end

data/lib/readme/har/response_serializer.rb

@@ -4,8 +4,6 @@ require "readme/har/collection"
 module Readme
   module Har
     class ResponseSerializer
-      JSON_MIME_TYPES = ["application/json", "application/x-json", "text/json", "text/x-json", "+json"]
-
       def initialize(request, response, filter)
         @request = request
         @response = response
@@ -29,9 +27,9 @@ module Readme
       private
 
       def content
-        if response_body.nil?
+        if @response.body.empty?
           empty_content
-        elsif content_type_is_json?
+        elsif @response.json?
           json_content
         else
           pass_through_content
@@ -43,37 +41,23 @@ module Readme
       end
 
       def json_content
-        parsed_body = JSON.parse(response_body)
+        parsed_body = JSON.parse(@response.body)
 
-        {mimeType: @response.content_type,
-         size: @response.content_length,
-         text: Har::Collection.new(@filter, parsed_body).to_h.to_json}
+        {
+          mimeType: @response.content_type,
+          size: @response.content_length,
+          text: Har::Collection.new(@filter, parsed_body).to_h.to_json
+        }
       rescue
         pass_through_content
       end
 
       def pass_through_content
-        {mimeType: @response.content_type,
-         size: @response.content_length,
-         text: response_body}
-      end
-
-      def response_body
-        if @response.body.nil?
-          nil
-        elsif @response.body.respond_to?(:rewind)
-          @response.body.rewind
-          body = @response.body.each.reduce(:+)
-          @response.body.rewind
-
-          body
-        else
-          @response.body.each.reduce(:+)
-        end
-      end
-
-      def content_type_is_json?
-        JSON_MIME_TYPES.include? @response.content_type
+        {
+          mimeType: @response.content_type,
+          size: @response.content_length,
+          text: @response.body
+        }
       end
     end
   end

data/lib/readme/har/serializer.rb

@@ -32,7 +32,8 @@ module Readme
       def creator
         {
           name: Readme::Metrics::SDK_NAME,
-          version: Readme::Metrics::VERSION
+          version: Readme::Metrics::VERSION,
+          comment: "#{Readme::Metrics::PLATFORM}/#{RUBY_VERSION}"
         }
       end
 

data/lib/readme/http_request.rb

@@ -0,0 +1,101 @@
+require "rack"
+require "rack/request"
+require_relative "content_type_helper"
+
+module Readme
+  class HttpRequest
+    include ContentTypeHelper
+
+    HTTP_NON_HEADERS = [
+      Rack::HTTP_COOKIE,
+      Rack::HTTP_VERSION,
+      Rack::HTTP_HOST,
+      Rack::HTTP_PORT
+    ]
+
+    def initialize(env)
+      @request = Rack::Request.new(env)
+    end
+
+    def url
+      @request.url
+    end
+
+    def query_params
+      @request.GET
+    end
+
+    def cookies
+      @request.cookies
+    end
+
+    def http_version
+      @request.get_header(Rack::HTTP_VERSION)
+    end
+
+    def request_method
+      @request.request_method
+    end
+
+    def content_type
+      @request.content_type
+    end
+
+    def form_data?
+      @request.form_data?
+    end
+
+    def content_length
+      @request.content_length.to_i
+    end
+
+    def options?
+      @request.request_method == "OPTIONS"
+    end
+
+    def headers
+      @request
+        .each_header
+        .select { |key, _| http_header?(key) }
+        .to_h
+        .transform_keys { |header| normalize_header_name(header) }
+        .merge unprefixed_headers
+    end
+
+    def body
+      @request.body.rewind
+      content = @request.body.read
+      @request.body.rewind
+
+      content
+    end
+
+    def parsed_form_data
+      @request.POST
+    end
+
+    private
+
+    # "headers" in Rack::Request just means any key in the env. The HTTP headers
+    # are all the headers prefixed with `HTTP_` as per the spec:
+    # https://github.com/rack/rack/blob/master/SPEC.rdoc#the-environment-
+    # Other "headers" like version and host are prefixed with `HTTP_` by Rack but
+    # don't seem to be considered legit HTTP headers.
+    def http_header?(name)
+      name.start_with?("HTTP") && !HTTP_NON_HEADERS.include?(name)
+    end
+
+    # Headers like `Content-Type: application/json` come into rack like
+    # `"HTTP_CONTENT_TYPE" => "application/json"`.
+    def normalize_header_name(header)
+      header.delete_prefix("HTTP_").split("_").map(&:capitalize).join("-")
+    end
+
+    # These special headers are explicitly _not_ prefixed with HTTP_ in the Rack
+    # env so we need to add them in manually
+    def unprefixed_headers
+      {"Content-Type" => @request.content_type,
+       "Content-Length" => @request.content_length}.compact
+    end
+  end
+end

data/lib/readme/http_response.rb

@@ -0,0 +1,45 @@
+require "rack"
+require "rack/response"
+require_relative "content_type_helper"
+
+module Readme
+  class HttpResponse < SimpleDelegator
+    include ContentTypeHelper
+
+    def self.from_parts(status, headers, body)
+      new(Rack::Response.new(body, status, headers))
+    end
+
+    def body
+      if raw_body.respond_to?(:rewind)
+        raw_body.rewind
+        content = raw_body.each.reduce("", :+)
+        raw_body.rewind
+
+        content
+      else
+        raw_body.each.reduce("", :+)
+      end
+    end
+
+    def content_length
+      if empty_body_status?
+        0
+      elsif !headers["Content-Length"]
+        body.bytesize
+      else
+        headers["Content-Length"].to_i
+      end
+    end
+
+    private
+
+    def raw_body
+      __getobj__.body
+    end
+
+    def empty_body_status?
+      Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i)
+    end
+  end
+end

data/lib/readme/metrics/version.rb

@@ -1,5 +1,5 @@
 module Readme
   class Metrics
-    VERSION = "0.2.0"
+    VERSION = "2.0.0"
   end
 end

data/lib/readme/metrics.rb

@@ -4,16 +4,30 @@ require "readme/filter"
 require "readme/payload"
 require "readme/request_queue"
 require "readme/errors"
-require "http_request"
+require "readme/http_request"
+require "readme/http_response"
 require "httparty"
 require "logger"
+require "os"
 
 module Readme
   class Metrics
+    def self.platform
+      if OS.windows?
+        "windows"
+      elsif OS.mac?
+        "mac"
+      elsif OS.linux?
+        "linux"
+      else
+        "unknown"
+      end
+    end
+
     SDK_NAME = "Readme.io Ruby SDK"
-    DEFAULT_BUFFER_LENGTH = 10
+    PLATFORM = platform
+    DEFAULT_BUFFER_LENGTH = 1
     ENDPOINT = "https://metrics.readme.io/v1/request"
-    USER_INFO_KEYS = [:id, :label, :email]
 
     def self.logger
       @@logger
@@ -32,7 +46,7 @@ module Readme
       @get_user_info = get_user_info
 
       buffer_length = options[:buffer_length] || DEFAULT_BUFFER_LENGTH
-      @@request_queue = Readme::RequestQueue.new(options[:api_key], buffer_length)
+      @@request_queue = options[:request_queue] || Readme::RequestQueue.new(options[:api_key], buffer_length)
       @@logger = options[:logger] || Logger.new($stdout)
     end
 
@@ -40,16 +54,17 @@ module Readme
       start_time = Time.now
       status, headers, body = @app.call(env)
       end_time = Time.now
-      response = Rack::Response.new(body, status, headers)
 
       begin
+        response = HttpResponse.from_parts(status, headers, body)
         process_response(
           response: response,
           env: env,
           start_time: start_time,
           end_time: end_time
         )
-      rescue
+      rescue => e
+        Readme::Metrics.logger.warn "The following error occured when trying to log to the ReadMe metrics API: #{e.message}. Request not logged."
         [status, headers, body]
       end
 
@@ -63,16 +78,34 @@ module Readme
       har = Har::Serializer.new(request, response, start_time, end_time, @filter)
       user_info = @get_user_info.call(env)
 
-      if user_info_invalid?(user_info)
-        Readme::Metrics.logger.error Errors.bad_block_message(user_info)
+      if !user_info_valid?(user_info)
+        Readme::Metrics.logger.warn Errors.bad_block_message(user_info)
       elsif request.options?
         Readme::Metrics.logger.info "OPTIONS request omitted from ReadMe API logging"
+      elsif !can_filter? request, response
+        Readme::Metrics.logger.warn "Request or response body MIME type isn't supported for filtering. Omitting request from ReadMe API logging"
       else
         payload = Payload.new(har, user_info, development: @development)
-        @@request_queue.push(payload.to_json)
+        @@request_queue.push(payload.to_json) unless payload.ignore
       end
     end
 
+    def can_filter?(request, response)
+      @filter.pass_through? || can_parse_bodies?(request, response)
+    end
+
+    def can_parse_bodies?(request, response)
+      parseable_request?(request) && parseable_response?(response)
+    end
+
+    def parseable_response?(response)
+      response.body.empty? || response.json?
+    end
+
+    def parseable_request?(request)
+      request.body.empty? || request.json? || request.form_data?
+    end
+
     def validate_options(options)
       raise Errors::ConfigurationError, Errors::API_KEY_ERROR if options[:api_key].nil?
 
@@ -112,10 +145,10 @@ module Readme
       arg == true || arg == false
     end
 
-    def user_info_invalid?(user_info)
-      user_info.nil? ||
-        user_info.values.any?(&:nil?) ||
-        USER_INFO_KEYS.sort != user_info.keys.sort
+    def user_info_valid?(user_info)
+      !user_info.nil? &&
+        !user_info.values.any?(&:nil?) &&
+        user_info.has_key?(:api_key) || user_info.has_key?(:id)
     end
   end
 end

data/lib/readme/payload.rb

@@ -1,13 +1,22 @@
+require "uuid"
+
 module Readme
   class Payload
-    def initialize(har, user_info, development:)
+    attr_reader :ignore
+
+    def initialize(har, info, development:)
       @har = har
-      @user_info = user_info
+      @user_info = info.slice(:id, :label, :email)
+      @user_info[:id] = info[:api_key] unless info[:api_key].nil? # swap api_key for id if api_key is present
+      @log_id = info[:log_id]
+      @ignore = info[:ignore]
       @development = development
+      @uuid = UUID.new
     end
 
     def to_json
       {
+        logId: UUID.validate(@log_id) ? @log_id : @uuid.generate,
         group: @user_info,
         clientIPAddress: "1.1.1.1",
         development: @development,

data/readme-metrics.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/readmeio/metrics-sdks/blob/master/packages/ruby"
-  spec.metadata["changelog_uri"] = "https://github.com/readmeio/metrics-sdks/blob/master/packages/ruby/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/readmeio/metrics-sdks/blob/main/packages/ruby"
+  spec.metadata["changelog_uri"] = "https://github.com/readmeio/metrics-sdks/blob/main/packages/ruby/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readme-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - ReadMe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,15 +38,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/console
 - bin/setup
-- lib/http_request.rb
+- lib/readme/content_type_helper.rb
 - lib/readme/errors.rb
 - lib/readme/filter.rb
 - lib/readme/har/collection.rb
 - lib/readme/har/request_serializer.rb
 - lib/readme/har/response_serializer.rb
 - lib/readme/har/serializer.rb
+- lib/readme/http_request.rb
+- lib/readme/http_response.rb
 - lib/readme/metrics.rb
 - lib/readme/metrics/version.rb
 - lib/readme/payload.rb
@@ -57,8 +60,8 @@ licenses:
 - ISC
 metadata:
   homepage_uri: https://docs.readme.com/metrics/docs/getting-started-with-api-metrics
-  source_code_uri: https://github.com/readmeio/metrics-sdks/blob/master/packages/ruby
-  changelog_uri: https://github.com/readmeio/metrics-sdks/blob/master/packages/ruby/CHANGELOG.md
+  source_code_uri: https://github.com/readmeio/metrics-sdks/blob/main/packages/ruby
+  changelog_uri: https://github.com/readmeio/metrics-sdks/blob/main/packages/ruby/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -74,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: SDK for Readme's metrics API

data/lib/http_request.rb

@@ -1,88 +0,0 @@
-require "rack"
-require "rack/request"
-
-class HttpRequest
-  HTTP_NON_HEADERS = [
-    Rack::HTTP_COOKIE,
-    Rack::HTTP_VERSION,
-    Rack::HTTP_HOST,
-    Rack::HTTP_PORT
-  ]
-
-  def initialize(env)
-    @request = Rack::Request.new(env)
-  end
-
-  def url
-    @request.url
-  end
-
-  def query_params
-    @request.GET
-  end
-
-  def cookies
-    @request.cookies
-  end
-
-  def http_version
-    @request.get_header(Rack::HTTP_VERSION)
-  end
-
-  def request_method
-    @request.request_method
-  end
-
-  def content_type
-    @request.content_type
-  end
-
-  def form_data?
-    @request.form_data?
-  end
-
-  def content_length
-    @request.content_length.to_i
-  end
-
-  def options?
-    @request.request_method == "OPTIONS"
-  end
-
-  def headers
-    @request
-      .each_header
-      .select { |key, _| http_header?(key) }
-      .to_h
-      .transform_keys { |header| normalize_header_name(header) }
-  end
-
-  def body
-    @request.body.rewind
-    content = @request.body.read
-    @request.body.rewind
-
-    content
-  end
-
-  def parsed_form_data
-    @request.POST
-  end
-
-  private
-
-  # "headers" in Rack::Request just means any key in the env. The HTTP headers
-  # are all the headers prefixed with `HTTP_` as per the spec:
-  # https://github.com/rack/rack/blob/master/SPEC.rdoc#the-environment-
-  # Other "headers" like version and host are prefixed with `HTTP_` by Rack but
-  # don't seem to be considered legit HTTP headers.
-  def http_header?(name)
-    name.start_with?("HTTP") && !HTTP_NON_HEADERS.include?(name)
-  end
-
-  # Headers like `Content-Type: application/json` come into rack like
-  # `"HTTP_CONTENT_TYPE" => "application/json"`.
-  def normalize_header_name(header)
-    header.delete_prefix("HTTP_").split("_").map(&:capitalize).join("-")
-  end
-end