influx_reporter 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ddddb2aec52aed72cd27b0068fd4c293b9f3300e4ad01955068aa335a2bca73
-  data.tar.gz: ae5677b7955e961a06f2e95927fb112474e02457ac506b8f84f16009518afad7
+  metadata.gz: 2b0730709cd958cf778fb9a098097e7e0cd5480de1d1eb5dae0741bd231d74f0
+  data.tar.gz: 63a762abff77d226038ece2240435626bf903efa95e7e1b1fb2c35a4f2e811a1
 SHA512:
-  metadata.gz: 73ab7f2528040eee3c65135adb3e5e2192705378741b3c3863c3d5d9ee1e34e4e9a617f577448eca2396919433e45db21488c5b39c893f1d774af071b5941578
-  data.tar.gz: 6f6013c5f538cd50c46a07ccb3b5facef447af48dc1891e924cd9cdaab47f8e2085d6b19dd2987e339cf3bc1ea94f516e3a920e3447c9909546543ab2986f93a
+  metadata.gz: 9b1b90c44b16e924f69be8ac91f558796612ea33576927d8f353d45cd5187205ac4a41da0dff6a6a6c862100d3124a007f6a2173f91aee4010acc9f5850a5c26
+  data.tar.gz: 6044d661cfb071d19119ed39b1b1fdff97378c9eab9e200b312c7de258d051aff87ebdf0453c8829cb09a238c3dd8d5dabb6d33c3d3fa9881297bff3cd0e7858

data/Gemfile

@@ -2,6 +2,4 @@
 
 eval_gemfile 'gemfiles/Gemfile.rails-5.0.x'
 
-gem 'pry'
-gem 'ruby-debug-ide'
-gem 'debase'
+gem 'pry'

data/README.md

@@ -34,8 +34,8 @@ require 'influx_reporter'
 
 # set up an InfluxReporter configuration
 config = InfluxReporter::Configuration.new do |conf|
-  conf.influx_reporter.database = 'endpoints'
-  conf.influx_reporter.influx_db = {
+  conf.database = 'endpoints'
+  conf.influx_db = {
       host: 'influxdb.local',
       port: '8080'
   }
@@ -156,6 +156,11 @@ Adding tags & values is also possible:
 InfluxReporter.report_event 'event_name', extra: { tags: { key: 'tag' }, values: { key: 'value' } }
 ```
 
+Finally, events might generate lots of keys and you may want to use a specific database just for this purpose.
+```ruby
+InfluxReporter.report_event 'event_name', database: 'events_database'
+```
+
 ## Manual profiling
 
 It's easy to add performance tracking wherever you want using the `InfluxReporter` module.

data/gemfiles/Gemfile.base

@@ -25,5 +25,5 @@ gem 'resque', require: false
 
 # Freeze Sidekiq to < 5 in Ruby 2.2 Gemfiles
 if RUBY_VERSION >= '2'
-  gem 'sidekiq', (RUBY_VERSION >= '2.2.2' ? '~> 5' : '~> 4'), require: false
+  gem 'sidekiq', (RUBY_VERSION >= '2.5.0' ? '~> 6' : '~> 4'), require: false
 end

data/gemfiles/Gemfile.rails-6.0.x

@@ -0,0 +1,5 @@
+eval_gemfile File.expand_path('../Gemfile.base', __FILE__)
+
+gem 'rails', '~> 5.0.0'
+gem 'tzinfo-data'
+gem 'sinatra'

data/lib/influx_reporter/client.rb

@@ -173,7 +173,7 @@ module InfluxReporter
       return if @pending_transactions.empty?
 
       data = @data_builders.transactions.build(@pending_transactions)
-      enqueue Worker::PostRequest.new('/transactions/', data)
+      enqueue Worker::PostRequest.new(resource_from_path('transactions', {}), data)
 
       @last_sent_transactions = Time.now.utc
       @pending_transactions = []
@@ -214,7 +214,7 @@ module InfluxReporter
       if error_message = ErrorMessage.from_exception(config, exception, opts)
         error_message.add_extra(@context) if @context
         data = @data_builders.error_message.build error_message
-        enqueue Worker::PostRequest.new('/errors/', data)
+        enqueue Worker::PostRequest.new(resource_from_path('errors', opts), data)
       end
     end
 
@@ -226,7 +226,7 @@ module InfluxReporter
       error_message = ErrorMessage.new(config, message, opts)
       error_message.add_extra(@context) if @context
       data = @data_builders.error_message.build error_message
-      enqueue Worker::PostRequest.new('/errors/', data)
+      enqueue Worker::PostRequest.new(resource_from_path('errors', opts), data)
     end
 
     def report_event(message, opts = {})
@@ -235,7 +235,7 @@ module InfluxReporter
       event = EventMessage.new(config, message, opts)
       event.add_extra(@context) if @context
       data = @data_builders.event.build event
-      enqueue Worker::PostRequest.new('/events/', data)
+      enqueue Worker::PostRequest.new(resource_from_path('events', opts), data)
     end
 
     def capture
@@ -264,6 +264,13 @@ module InfluxReporter
       @queue << request
     end
 
+    def resource_from_path(path, opts)
+      obj = { url: "/#{path}/" }
+      obj[:database] = opts[:database] if opts[:database]
+      obj
+    end
+
+
     def start_worker
       return if worker_running?
 

data/lib/influx_reporter/error_message.rb

@@ -45,6 +45,7 @@ module InfluxReporter
     attr_accessor :stacktrace
     attr_accessor :http
     attr_accessor :user
+    attr_accessor :database
 
     def self.from_exception(config, exception, opts = {})
       message = "#{exception.class}: #{exception.message}"

data/lib/influx_reporter/event_message.rb

@@ -24,6 +24,7 @@ module InfluxReporter
     attr_accessor :message
     attr_reader :timestamp
     attr_accessor :extra
+    attr_accessor :database
 
     def add_extra(info)
       @extra ||= {}

data/lib/influx_reporter/influx_db_client.rb

@@ -14,14 +14,14 @@ module InfluxReporter
     # @param config [InfluxReporter::Configuration]
     def initialize(config)
       @config = config
-      @client = InfluxDB::Client.new config.database, config.influx_db.merge(time_precision: 'ns')
+      @client = InfluxDB::Client.new config.database, **config.influx_db.merge(time_precision: 'ns')
       @state = ClientState.new config
     end
 
     attr_reader :config
 
     def post(resource, data)
-      debug "POST #{resource}"
+      debug "POST #{resource[:url]}"
 
       unless state.should_try?
         info 'Temporarily skipping sending to InfluxReporter due to previous failure.'
@@ -30,7 +30,7 @@ module InfluxReporter
 
       begin
         data = [data] unless data.is_a?(Array)
-        client.write_points data
+        client.write_points data, nil, nil, resource.fetch(:database, nil)
       rescue StandardError => e
         debug { e.message }
         @state.fail!

data/lib/influx_reporter/trace.rb

@@ -23,12 +23,14 @@ module InfluxReporter
       @start_time = Util.nanos
       @relative_start = start_time - relative_to
 
+      @transaction._trace_started self
       self
     end
 
     def done(ms = Util.nanos)
       @duration = ms - start_time
 
+      @transaction._trace_stopped self
       self
     end
 

data/lib/influx_reporter/transaction.rb

@@ -19,6 +19,7 @@ module InfluxReporter
 
       @timestamp = Util.nanos
 
+      @running_traces = []
       @root_trace = Trace.new(self, ROOT_TRACE_NAME, ROOT_TRACE_NAME)
       @traces = [@root_trace]
       @notifications = []
@@ -77,6 +78,18 @@ module InfluxReporter
       result
     end
 
+    def _trace_started(trace)
+      @running_traces.push trace
+    end
+
+    def _trace_stopped(trace)
+      if @running_traces.last == trace
+        @running_traces.pop
+      else
+        @running_traces.delete trace
+      end
+    end
+
     def extra_tags
       @root_trace.extra[:tags] ||= {}
       yield @root_trace.extra[:tags]
@@ -88,11 +101,11 @@ module InfluxReporter
     end
 
     def running_traces
-      traces.select(&:running?)
+      @running_traces.clone
     end
 
     def current_trace
-      traces.reverse.find(&:running?)
+      @running_traces.last
     end
 
     def current_offset

data/lib/influx_reporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InfluxReporter
-  VERSION = '1.1.0'
+  VERSION = '1.2.2'
 end

data/lib/influx_reporter/worker.rb

@@ -5,10 +5,10 @@ module InfluxReporter
   class Worker
     include Logging
 
-    class PostRequest < Struct.new(:path, :data)
+    class PostRequest < Struct.new(:resource, :data)
       # require all parameters
-      def initialize(path, data)
-        super(path, data)
+      def initialize(resource, data)
+        super(resource, data)
       end
     end
 
@@ -46,7 +46,7 @@ module InfluxReporter
       end
 
       begin
-        @influx_client.post(req.path, req.data)
+        @influx_client.post(req.resource, req.data)
       rescue => e
         fatal "Failed POST: #{e.inspect}"
         debug e.backtrace.join("\n")

data/spec/influx_reporter/worker_spec.rb

@@ -25,13 +25,13 @@ module InfluxReporter
         end
 
         it 'pops the queue' do
-          @queue << Worker::PostRequest.new('/errors/', { series: 'test', values: { id: 1 }, timestamp: 0})
-          @queue << Worker::PostRequest.new('/errors/', { series: 'test', values: { id: 1 }, timestamp: 1})
+          @queue << Worker::PostRequest.new({ url: '/errors/' }, { series: 'test', values: { id: 1 }, timestamp: 0})
+          @queue << Worker::PostRequest.new({ url: '/errors/', database: 'db2' }, { series: 'test', values: { id: 1 }, timestamp: 1})
 
           subject
 
           expect(WebMock).to have_requested(:post, %r{/write}).with(body: 'test id=1i 0')
-          expect(WebMock).to have_requested(:post, %r{/write}).with(body: 'test id=1i 1')
+          expect(WebMock).to have_requested(:post, %r{/write\?db=db2}).with(body: 'test id=1i 1')
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influx_reporter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Kacper Kawecki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: kacper@geniebelt.com
 executables: []
 extensions: []
@@ -77,6 +77,7 @@ files:
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.2.x
 - gemfiles/Gemfile.rails-5.0.x
+- gemfiles/Gemfile.rails-6.0.x
 - gemfiles/Gemfile.rails-HEAD
 - influx_reporter.gemspec
 - lib/influx_reporter.rb
@@ -94,7 +95,6 @@ files:
 - lib/influx_reporter/error_message/user.rb
 - lib/influx_reporter/event_message.rb
 - lib/influx_reporter/filter.rb
-- lib/influx_reporter/http_client.rb
 - lib/influx_reporter/influx_db_client.rb
 - lib/influx_reporter/injections.rb
 - lib/influx_reporter/injections/json.rb
@@ -168,7 +168,7 @@ homepage: https://github.com/GenieBelt/influx-reporter
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,9 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Metrics collector for rails and InfluxDB based on Opbeat Ruby client library
 test_files: []

data/lib/influx_reporter/http_client.rb

@@ -1,140 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-require 'net/http'
-require 'json'
-
-module InfluxReporter
-  # @api private
-  class HttpClient
-    include Logging
-
-    USER_AGENT = "influx_reporter-ruby/#{InfluxReporter::VERSION}"
-
-    attr_reader :state
-    attr_reader :adapter
-
-    def initialize(config)
-      @config = config
-      @adapter = HTTPAdapter.new(config)
-      @state = ClientState.new config
-    end
-
-    attr_reader :config
-
-    def post(resource, body)
-      path = abs_path(resource)
-      debug "POST #{resource}"
-
-      unless state.should_try?
-        info 'Temporarily skipping sending to InfluxReporter due to previous failure.'
-        return
-      end
-
-      body = JSON.dump(body) if body.is_a?(Hash) || body.is_a?(Array)
-
-      request = adapter.post path do |req|
-        req['Authorization'] = auth_header
-        req['Content-Type'] = 'application/json'
-        req['Content-Length'] = body.bytesize.to_s
-        req['User-Agent'] = USER_AGENT
-        req.body = body
-      end
-
-      begin
-        response = adapter.perform_request request
-        unless response.code.to_i.between?(200, 299)
-          raise Error, "Error from InfluxReporter server (#{response.code}): #{response.body}"
-        end
-      rescue
-        debug { JSON.parse(body).inspect }
-        @state.fail!
-        raise
-      end
-
-      @state.success!
-
-      response
-    end
-
-    private
-
-    def auth_header
-      "Bearer #{@config.secret_token}"
-    end
-
-    def abs_path(path)
-      "/api/v1/organizations/#{@config.organization_id}" \
-        "/apps/#{@config.app_id}#{path}"
-    end
-
-    def encode(event)
-      event_hash = @filter.process_event_hash(event.to_hash)
-      event_hash.to_json
-    end
-
-    class HTTPAdapter
-      def initialize(conf)
-        @config = conf
-      end
-
-      def post(path)
-        req = Net::HTTP::Post.new path
-        yield req if block_given?
-        req
-      end
-
-      def perform_request(req)
-        http.start do |http|
-          http.request req
-        end
-      end
-
-      private
-
-      def http
-        return @http if @http
-
-        http = Net::HTTP.new server_uri.host, server_uri.port
-        http.use_ssl = @config.use_ssl
-        http.read_timeout = @config.timeout
-        http.open_timeout = @config.open_timeout
-
-        @http = http
-      end
-
-      def server_uri
-        @uri ||= URI(@config.server)
-      end
-    end
-
-    class ClientState
-      def initialize(config)
-        @config = config
-        @retry_number = 0
-        @last_check = Time.now.utc
-      end
-
-      def should_try?
-        return true if @status == :online
-
-        interval = ([@retry_number, 6].min**2) * @config.backoff_multiplier
-        return true if Time.now.utc - @last_check > interval
-
-        false
-      end
-
-      def fail!
-        @status = :error
-        @retry_number += 1
-        @last_check = Time.now.utc
-      end
-
-      def success!
-        @status = :online
-        @retry_number = 0
-        @last_check = nil
-      end
-    end
-  end
-end