stackify-ruby-apm 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701a5bf72b0d237602bbb07c71923d404565da0161c71a36fd1886bfac0fddc9
-  data.tar.gz: c91c611b46c3747bdf5f2e840a3c88cdd1562beb1a364cb1a80ba06c6d18ffc4
+  metadata.gz: 2a671e23d695c474d3aafa85df6756d98fa51610411f40e2c750a8e2e5ad2bb1
+  data.tar.gz: c34ada9683508fbf2345434260c616100a5394fc58c22c4ea5eeceb8e7be78fe
 SHA512:
-  metadata.gz: 778c0414e397291ee79cfa4a570fa4a85db6f84db87f070591e53102d1b8be76ee46c871518c19fea615d21f9227c3e67b29dd2923468175d5b4a38579fea1e6
-  data.tar.gz: 5576bd8a1932c69c0ee70e157d60ba59f4024ebc7230a941f31051c370d31b43203693171ef8f8bc0555cd0ba5d4ccb0161a55210c5ecd8004a7cb3a11e232f8
+  metadata.gz: 135db2d570f4d24b94ebd39f70909eb1ca21beb52052eaf25f1788d339039803f229ccdfaea00618386f6656378ae934e79f4a85d4c8eee059ff3941794b9c3f
+  data.tar.gz: b6d344829e9d14e8736bf3e0807fe2c9995d859a733fd1b79920196bc30df3afeac1c2374ad469e1a4bffe9428f43b258243af5138c61981e627ba14f37928f7

data/Gemfile

@@ -9,13 +9,15 @@ group :test do
   gem 'activerecord'
   gem 'curb', '0.9.8'
   gem 'fakeredis'
+  gem 'google-protobuf', '3.5.0'
   gem 'http'
   gem 'httpclient'
   gem 'mongo'
   gem 'mysql2'
+  gem 'net_http_unix', '~> 0.2'
   gem 'pg', '~> 0.20'
   gem 'rack-test'
-  gem 'rails'
+  gem 'rails', '~> 4.0'
   gem 'rubocop', require: false
   gem 'sequel'
   gem 'sinatra'

data/Gemfile.lock

@@ -1,79 +1,82 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (1.3.1)
+    stackify-ruby-apm (1.7.4)
       concurrent-ruby (~> 1.0)
       delegate_matcher (~> 0.4)
+      google-protobuf (= 3.5.0)
+      net_http_unix (~> 0.2)
       rufus-scheduler (~> 3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11)
-      actionpack (= 4.2.11)
-      actionview (= 4.2.11)
-      activejob (= 4.2.11)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11)
-      actionview (= 4.2.11)
-      activesupport (= 4.2.11)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11)
-      activesupport (= 4.2.11)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11)
-      activesupport (= 4.2.11)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.11)
-      activesupport (= 4.2.11)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.11)
-      activemodel (= 4.2.11)
-      activesupport (= 4.2.11)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
-    activesupport (4.2.11)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (6.0.4)
     ast (2.4.0)
-    bson (4.4.2)
+    bson (4.5.0)
     builder (3.2.3)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     curb (0.9.8)
     delegate_matcher (0.4.3)
       proc_extensions (~> 0.2)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    et-orbi (1.2.0)
+    et-orbi (1.2.2)
       tzinfo
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (0.15.4)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     file-tail (1.2.0)
       tins (~> 1.0)
-    fugit (1.2.0)
+    fugit (1.3.3)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    hashdiff (0.3.8)
+    google-protobuf (3.5.0)
+    hashdiff (1.0.0)
     http (3.0.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -86,28 +89,25 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.1.0)
-    minitest (5.11.3)
-    mongo (2.7.1)
+    minitest (5.12.0)
+    mongo (2.10.2)
       bson (>= 4.4.2, < 5.0.0)
-    multipart-post (2.0.0)
-    mysql2 (0.5.2)
-    mysql2 (0.5.2-x64-mingw32)
+    multipart-post (2.1.1)
+    mysql2 (0.5.3)
+    net_http_unix (0.2.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-x64-mingw32)
-      mini_portile2 (~> 2.1.0)
     parallel (1.13.0)
-    parser (2.6.0.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pg (0.21.0)
-    pg (0.21.0-x64-mingw32)
     powerpack (0.1.2)
     proc_extensions (0.2)
       sourcify (~> 0.5)
@@ -118,16 +118,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.11)
-      actionmailer (= 4.2.11)
-      actionpack (= 4.2.11)
-      actionview (= 4.2.11)
-      activejob (= 4.2.11)
-      activemodel (= 4.2.11)
-      activerecord (= 4.2.11)
-      activesupport (= 4.2.11)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -135,30 +135,30 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.11)
-      actionpack (= 4.2.11)
-      activesupport (= 4.2.11)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
     redis (3.3.5)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     rubocop (0.50.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -166,22 +166,22 @@ GEM
       rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    ruby2ruby (2.4.2)
+    ruby-progressbar (1.10.1)
+    ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.13.1)
+    ruby_parser (3.14.0)
       sexp_processor (~> 4.9)
     rufus-scheduler (3.6.0)
       fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
-    sequel (5.18.0)
-    sexp_processor (4.12.0)
+    sequel (5.27.0)
+    sexp_processor (4.13.0)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sinatra-activerecord (2.0.13)
+    sinatra-activerecord (2.0.14)
       activerecord (>= 3.2)
       sinatra (>= 1.0)
     sourcify (0.5.0)
@@ -197,43 +197,44 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    sqlite3 (1.3.13-x64-mingw32)
-    stackify-api-ruby (1.0.13)
+    stackify-api-ruby (1.1.0)
       faraday (~> 0.8)
+      google-protobuf (~> 3.0)
+      net_http_unix (~> 0.2)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     timecop (0.9.1)
-    tins (1.20.2)
-    to_bool (1.2.0)
+    tins (1.22.2)
+    to_bool (2.0.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
-    unf_ext (0.0.7.5-x64-mingw32)
-    unicode-display_width (1.5.0)
-    webmock (3.5.1)
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.6.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
   activerecord
   bundler (~> 1.16)
   curb (= 0.9.8)
   fakeredis
+  google-protobuf (= 3.5.0)
   http
   httpclient
   mongo
   mysql2
+  net_http_unix (~> 0.2)
   pg (~> 0.20)
   rack-test
-  rails
+  rails (~> 4.0)
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop

data/lib/proto/stackify_trace.rb

@@ -0,0 +1,39 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: stackify-trace.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message 'stackify.Traces' do
+    repeated :traces, :message, 1, 'stackify.Trace'
+  end
+  add_message 'stackify.Trace' do
+    optional :frame, :message, 1, 'stackify.TraceFrame'
+  end
+  add_message 'stackify.TraceFrame' do
+    optional :call, :string, 1
+    optional :start_timestamp_millis, :double, 2
+    optional :end_timestamp_millis, :double, 3
+    map :properties, :string, :string, 4
+    repeated :frames, :message, 5, 'stackify.TraceFrame'
+    repeated :exceptions, :message, 6, 'stackify.TraceException'
+  end
+  add_message 'stackify.TraceException' do
+    optional :caught_by, :string, 1
+    optional :exception, :string, 2
+    optional :message, :string, 3
+    optional :timestamp_millis, :double, 4
+    repeated :frames, :message, 5, 'stackify.TraceExceptionFrame'
+  end
+  add_message 'stackify.TraceExceptionFrame' do
+    optional :method, :string, 1
+  end
+end
+
+module StackifyProtoBuf
+  Traces = Google::Protobuf::DescriptorPool.generated_pool.lookup('stackify.Traces').msgclass
+  Trace = Google::Protobuf::DescriptorPool.generated_pool.lookup('stackify.Trace').msgclass
+  TraceFrame = Google::Protobuf::DescriptorPool.generated_pool.lookup('stackify.TraceFrame').msgclass
+  TraceException = Google::Protobuf::DescriptorPool.generated_pool.lookup('stackify.TraceException').msgclass
+  TraceExceptionFrame = Google::Protobuf::DescriptorPool.generated_pool.lookup('stackify.TraceExceptionFrame').msgclass
+end

data/lib/stackify_apm/agent.rb

@@ -25,21 +25,26 @@ module StackifyRubyAPM
       @instance
     end
 
+    # rubocop:disable Metrics/PerceivedComplexity
     # rubocop:disable Metrics/CyclomaticComplexity
     def self.start(config)
       return @instance if @instance
 
       config = Config.new(config) unless config.is_a?(Config)
-      pid = $PID || Process.pid
-      host_name = config.hostname || `hostname`
-      date_now = Time.now
-      current_trace_file = config.log_trace_path + squish(host_name) + '#' + squish(pid.to_s)
-
-      if ENV['STACKIFY_RUBY_ENV'] != 'rspec'
-        config.tracer_logger = StackifyLogger.new(current_trace_file, config.filenum_rotate, config.logger_byte_size)
-        config.debug_logger
-        config.logtime_created = date_now.strftime('%H:%M')
-        Util::TraceLogWatcher.delete_trace_logs(config)
+      case config.transport.downcase
+      # For unix socket we don't create a trace log file
+      when StackifyRubyAPM::TRACE_LOG
+        # For Default transport let's create initial trace log file
+        pid = $PID || Process.pid
+        host_name = (config.hostname || `hostname`).strip
+        date_now = Time.now
+        current_trace_file = config.log_trace_path + squish(host_name) + '#' + squish(pid.to_s)
+        if ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+          config.tracer_logger = StackifyLogger.new(current_trace_file, config.filenum_rotate, config.logger_byte_size)
+          config.debug_logger
+          config.logtime_created = date_now.strftime('%H:%M')
+          Util::TraceLogWatcher.delete_trace_logs(config)
+        end
       end
 
       LOCK.synchronize do
@@ -49,6 +54,7 @@ module StackifyRubyAPM
       end
     end
     # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def self.stop
       LOCK.synchronize do
@@ -93,6 +99,7 @@ module StackifyRubyAPM
 
     def start
       info '[Agent] start()'
+      info '[Agent] transport type: ' + @config.transport
       spies_name = ''
       # If the rake task is detected as being ran then we don't load the spies
       StackifyRubyAPM::Util.apm_disabled_in_rake
@@ -103,7 +110,7 @@ module StackifyRubyAPM
         require "stackify_apm/spies/#{lib}"
       end
 
-      debug '[Agent] Loaded spies: ' + spies_name if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Agent] Loaded spies: ' + spies_name if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
       self
     end
 
@@ -119,7 +126,7 @@ module StackifyRubyAPM
     end
 
     def should_flush_transactions?
-      return true unless config.flush_interval
+      return true unless config.flush_interval_seconds
       return true if pending_transactions.length >= config.max_queue_size
 
       false
@@ -188,7 +195,7 @@ module StackifyRubyAPM
     private
 
     def boot_worker
-      debug '[Agent] Booting worker' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Agent] Booting worker' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
 
       @worker_thread = Thread.new do
         Worker.new(

data/lib/stackify_apm/config.rb

@@ -8,6 +8,8 @@ require 'logger'
 require 'yaml'
 require 'socket'
 module StackifyRubyAPM
+  TRANSPORT = [TRACE_LOG = 'default'.freeze, UNIX_SOCKET = 'agent_socket'.freeze, AGENT_HTTP = 'agent_http'.freeze].freeze
+
   # @api private
   class Config
     include Log
@@ -22,6 +24,7 @@ module StackifyRubyAPM
       rum_enabled: false,
       rum_cookie_path: '/',
       rum_cookie_name: '.Stackify.Rum',
+      transport: StackifyRubyAPM::TRACE_LOG,
       instrument: true,
       debug_logging: false,
       log_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\stackify-ruby-apm-1.log' : '/usr/local/stackify/stackify-ruby-apm/log/stackify-ruby-apm-1.log',
@@ -29,14 +32,16 @@ module StackifyRubyAPM
       log_trace_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\\' : '/usr/local/stackify/stackify-ruby-apm/log/',
 
       max_queue_size: 500, # Maximum queue length of transactions before sending transactions to the APM.
-      flush_interval: 1, # interval with which transactions should be sent to the APM. Default value: 10 seconds
+      flush_interval_seconds: 1, # interval with which transactions should be sent to the APM. Default value: 1 seconds
+      delay_seconds: 10, # Interval in seconds between tries
+      max_retries: 3, # Number of attempts
 
       filter_exception_types: [],
 
       tracer_logger: nil,
       logger_byte_size: 50_000_000, # e.g, 50_000_000=50mb
       filenum_rotate: 20,
-      debugger_byte_size: 20_000_000,
+      debugger_byte_size: 20_000_000, # e.g, 20_000_000=20mb
       debugger_filenum_rotate: 3,
       logtime_created: 0,
       http_status: nil,
@@ -54,29 +59,35 @@ module StackifyRubyAPM
 
       view_paths: [],
       root_path: Dir.pwd,
-      stackify_properties_file: '/usr/local/stackify/stackify-ruby-apm/stackify.properties'
+      stackify_properties_file: '/usr/local/stackify/stackify-ruby-apm/stackify.properties',
+      agent_traces_url: '/traces',
+      unix_socket_path: '/usr/local/stackify/stackify.sock',
+      transport_http_endpoint: 'https://localhost:10601'
     }.freeze
 
     ENV_TO_KEY = {
-      'STACKIFY_APM_ENVIRONMENT_NAME' => 'environment_name',
-      'STACKIFY_APM_RUM_SCRIPT_SRC' => 'rum_script_src',
-      'STACKIFY_APM_RUM_AUTO_INJECTION' => 'rum_auto_injection',
-      'STACKIFY_APM_RUM_ENABLED' => 'rum_enabled',
+      'STACKIFY_DEBUG' => [:bool, 'debug_logging'],
+      'STACKIFY_APPLICATION_NAME' => 'application_name',
+      'STACKIFY_ENVIRONMENT_NAME' => 'environment_name',
+      'STACKIFY_RUM' => [:bool, 'rum_enabled'],
+      'STACKIFY_RUM_AUTO_INJECT' => [:bool, 'rum_auto_injection'],
+      'STACKIFY_RUM_SCRIPT_SRC' => 'rum_script_src',
+      'STACKIFY_TRANSPORT' => 'transport',
+      'STACKIFY_TRANSPORT_LOG_PATH' => 'log_path',
+      'STACKIFY_TRANSPORT_LOG_LEVEL' => [:int, 'log_level'],
+      'STACKIFY_TRANSPORT_SOCKET_PATH' => 'unix_socket_path',
+      'STACKIFY_TRANSPORT_HTTP_ENDPOINT' => 'transport_http_endpoint',
       'STACKIFY_ALREADY_INSTRUMENTED_FLAG' => 'already_instrumented_flag',
-      'STACKIFY_APM_DEBUG_LOGGING' => 'debug_logging',
-      'STACKIFY_APM_INSTRUMENT' => [:bool, 'instrument'],
-      'STACKIFY_APM_HOSTNAME' => 'hostname',
-      'STACKIFY_APM_LOG_PATH' => 'log_path',
-      'STACKIFY_APM_LOG_LEVEL' => [:int, 'log_level'],
-      'STACKIFY_APM_APPLICATION_NAME' => 'application_name',
-      'STACKIFY_APM_SOURCE_LINES_ERROR_APP_FRAMES' => [:int, 'source_lines_error_app_frames'],
-      'STACKIFY_APM_SOURCE_LINES_SPAN_APP_FRAMES' => [:int, 'source_lines_span_app_frames'],
-      'STACKIFY_APM_SOURCE_LINES_ERROR_LIBRARY_FRAMES' => [:int, 'source_lines_error_library_frames'],
-      'STACKIFY_APM_SOURCE_LINES_SPAN_LIBRARY_FRAMES' => [:int, 'source_lines_span_library_frames'],
-      'STACKIFY_APM_SPAN_FRAMES_MIN_DURATION' => [:int, 'span_frames_min_duration'],
-      'STACKIFY_APM_MAX_QUEUE_SIZE' => [:int, 'max_queue_size'],
-      'STACKIFY_APM_FLUSH_INTERVAL' => 'flush_interval',
-      'STACKIFY_APM_DISABLED_SPIES' => [:list, 'disabled_spies']
+      'STACKIFY_INSTRUMENT' => [:bool, 'instrument'],
+      'STACKIFY_HOSTNAME' => 'hostname',
+      'STACKIFY_SOURCE_LINES_ERROR_APP_FRAMES' => [:int, 'source_lines_error_app_frames'],
+      'STACKIFY_SOURCE_LINES_SPAN_APP_FRAMES' => [:int, 'source_lines_span_app_frames'],
+      'STACKIFY_SOURCE_LINES_ERROR_LIBRARY_FRAMES' => [:int, 'source_lines_error_library_frames'],
+      'STACKIFY_SOURCE_LINES_SPAN_LIBRARY_FRAMES' => [:int, 'source_lines_span_library_frames'],
+      'STACKIFY_SPAN_FRAMES_MIN_DURATION' => [:int, 'span_frames_min_duration'],
+      'STACKIFY_MAX_QUEUE_SIZE' => [:int, 'max_queue_size'],
+      'STACKIFY_FLUSH_INTERVAL' => 'flush_interval_seconds',
+      'STACKIFY_DISABLED_SPIES' => [:list, 'disabled_spies']
     }.freeze
 
     def initialize(options = {})
@@ -86,7 +97,7 @@ module StackifyRubyAPM
       set_from_env
       yield self if block_given?
       debug_logger
-      StackifyRubyAPM::Util.host_os == 'WINDOWS' ? load_stackify_props_windows : load_stackify_props
+      StackifyRubyAPM::Util.host_os == 'WINDOWS' ? load_stackify_props_windows : load_stackify_props_linux
       validate_apm_yml
     end
 
@@ -103,6 +114,10 @@ module StackifyRubyAPM
     attr_accessor :instrument
     attr_accessor :enabled_environments
     attr_accessor :stackify_properties_file
+    attr_accessor :transport
+    attr_accessor :agent_traces_url
+    attr_accessor :unix_socket_path
+    attr_accessor :transport_http_endpoint
 
     attr_accessor :application_name
     attr_accessor :hostname
@@ -129,7 +144,9 @@ module StackifyRubyAPM
     attr_accessor :span_frames_min_duration
 
     attr_accessor :max_queue_size
-    attr_accessor :flush_interval
+    attr_accessor :flush_interval_seconds
+    attr_accessor :delay_seconds
+    attr_accessor :max_retries
 
     attr_accessor :filter_exception_types
 
@@ -258,7 +275,7 @@ module StackifyRubyAPM
 
     # rubocop:disable Naming/AccessorMethodName
     def set_rails(app)
-      self.application_name ||= format_name(application_name || app.class.parent_name)
+      self.application_name ||= format_name(application_name || app.class.parent_name).strip
       self.logger ||= Rails.logger
 
       self.root_path = Rails.root.to_s
@@ -278,7 +295,7 @@ module StackifyRubyAPM
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
-    def load_stackify_props
+    def load_stackify_props_linux
       @client_id = nil
       @device_id = nil
       @client_run_domain = nil
@@ -341,6 +358,8 @@ module StackifyRubyAPM
       info '[Config] rum_auto_injection must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@rum_auto_injection.class) && defined?(@rum_auto_injection)
       info '[Config] application_name must be String type.' unless @application_name.is_a?(String) && defined?(@application_name)
       info '[Config] environment_name must be String type.' unless @environment_name.is_a?(String) && defined?(@environment_name)
+      info '[Config] transport must be String type.' unless @transport.is_a?(String) && defined?(@transport)
+      info '[Config] Transport should be one of these values: [agent_socket, default, agent_http]. Should be a String.' if defined?(@transport) && !%w[agent_socket default agent_http].include?(@transport.downcase)
     end
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity

data/lib/stackify_apm/instrumenter.rb

@@ -27,7 +27,7 @@ module StackifyRubyAPM
     end
 
     def initialize(agent)
-      debug '[Instrumenter] initialize()' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Instrumenter] initialize()' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
       @agent = agent
       @config = agent.config
 
@@ -95,8 +95,7 @@ module StackifyRubyAPM
     # Once the transaction is submitted it will be stored temporarily in queue
     #
     def submit_transaction(transaction)
-      debug '[Instrumenter] submit_transaction(transaction)' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
-      debug '[Instrumenter] submit_transaction(transaction) transaction: ' + transaction.inspect.to_s if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Instrumenter] submit_transaction(transaction) transaction: ' + transaction.inspect.to_s if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
       agent.enqueue_transaction transaction
       return unless config.debug_transactions
     end

data/lib/stackify_apm/middleware.rb

@@ -14,7 +14,7 @@
 #   -> SUBMITS transaction: stackify_apm/transaction.rb (#submit)
 #     -> instrumenter submits transaction
 #     -> worker will run (if != running), responsible for sending transactions to APM
-#        for every 10 secs (based on config.flush_interval)
+#        for every 1 secs (based on config.flush_interval_seconds)
 #     -> transaction will be stored in queue by Agent
 #     -> worker will constantly execute transaction sending to APM
 #
@@ -46,21 +46,23 @@ module StackifyRubyAPM
         @rack_headers = resp[1]
         @rack_body = resp[2]
         @configuration = config
-        response_manupulate = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
 
         if okay_to_modify?
           @configuration.already_instrumented_flag = true
-          if @configuration.rum_auto_injection.is_a?(TrueClass)
-            response_string = response_manupulate.adjust_pagehtml_response
-          end
-          if response_string
-            response = Rack::Response.new(response_string, @rack_status, @rack_headers)
-            response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path) if @configuration.rum_enabled.is_a?(TrueClass)
-            resp = response.finish
-          elsif @configuration.rum_enabled.is_a?(TrueClass)
+          if @configuration.rum_enabled.is_a?(TrueClass)
             response = Rack::Response.new @rack_body, @rack_status, @rack_headers
             response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path)
             resp = response.finish
+          end
+          if @configuration.rum_auto_injection.is_a?(TrueClass)
+            response_manupulate = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
+            response_string = response_manupulate.adjust_pagehtml_response
+            if response_string
+              response = Rack::Response.new(response_string, resp[0].to_i, resp[1])
+              resp = response.finish
+            else
+              resp
+            end
           else
             resp
           end

data/lib/stackify_apm/response_manipulator.rb

@@ -62,25 +62,13 @@ module StackifyRubyAPM
       end
 
       return unless inject_flag
-      jsfile_to_inject = StackifyRubyAPM.inject_rum_script
 
       # Only scan the first 50k (roughly) then give up.
-      beginning_of_source = source[0..SCAN_LIMIT]
-
-      meta_tag_positions = [
-        find_x_ua_compatible_position(beginning_of_source),
-        find_charset_position(beginning_of_source)
-      ].compact
-
-      insertion_index = if !meta_tag_positions.empty?
-                          meta_tag_positions.max
-                        else
-                          find_end_of_head_open(beginning_of_source)
-                        end
+      insertion_index = find_end_of_head_open(source[0..SCAN_LIMIT])
 
       if insertion_index && inject_flag
         source = source[0...insertion_index] <<
-                 jsfile_to_inject <<
+                 StackifyRubyAPM.inject_rum_script <<
                  source[insertion_index..-1]
       end
       source
@@ -93,21 +81,6 @@ module StackifyRubyAPM
       beginning_of_source.index(GT, head_open) - 6 if head_open
     end
 
-    def find_rum_script_variable_index(beginning_of_source)
-      head_open = beginning_of_source.index(RUM_SCRIPT_VARIABLE)
-      beginning_of_source.index(BRKT, head_open) - 20 if head_open
-    end
-
-    def find_x_ua_compatible_position(beginning_of_source)
-      match = X_UA_COMPATIBLE_RE.match(beginning_of_source)
-      match.end(0) if match
-    end
-
-    def find_charset_position(beginning_of_source)
-      match = CHARSET_RE.match(beginning_of_source)
-      match.end(0) if match
-    end
-
     def gather_source(response)
       source = nil
       response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }

data/lib/stackify_apm/root_info.rb

@@ -19,14 +19,14 @@ module StackifyRubyAPM
         CATEGORY: 'Ruby',
         APPLICATION_PATH: '/',
         APPLICATION_FILESYSTEM_PATH: @config.root_path,
-        APPLICATION_NAME: @config.application_name,
+        APPLICATION_NAME: @config.application_name.strip,
         APPLICATION_ENV: @config.environment_name || 'Development',
         REPORTING_URL: @transaction.name,
         TRACE_ID: @transaction.id,
         THREAD_ID: Thread.current.object_id,
         TRACE_SOURCE: 'RUBY',
         TRACE_TARGET: 'RETRACE',
-        HOST_NAME: @config.hostname || `hostname`,
+        HOST_NAME: (@config.hostname || `hostname`).strip,
         OS_TYPE: StackifyRubyAPM::Util.host_os,
         PROCESS_ID: pid,
         TRACE_VERSION: '2.0',

data/lib/stackify_apm/serializers/transactions.rb

@@ -8,7 +8,9 @@ module StackifyRubyAPM
     class Transactions < Serializer
       include Log
 
-      def build(config, transaction)
+      # This method will return a Hash object(Transaction).
+      # It will accept Config and Transaction instance.
+      def build_json(config, transaction)
         root_span_json = {
           id: -1,
           call: transaction.name,
@@ -27,10 +29,78 @@ module StackifyRubyAPM
 
         add_children_spans(root_span_json, children_spans_json)
         root_span_json
+      rescue StandardError => e
+        debug "[Transactions::Serializer] build_json() exception: #{e.inspect}"
+      end
+
+      # This method will build a Protobuf object.
+      # It will accept the Config and Transaction instance.
+      # Return a Stackify::Trace object.
+      def build_protobuf(config, transaction)
+        root_span_hash = build_json(config, transaction)
+        begin
+          # create Trace object
+          trace = StackifyProtoBuf::Trace.new
+          # create TraceFrame object
+          trace_frame = StackifyProtoBuf::TraceFrame.new
+          trace_frame.call = root_span_hash[:call].to_s
+          trace_frame.start_timestamp_millis = root_span_hash[:reqBegin]
+          trace_frame.end_timestamp_millis = root_span_hash[:reqEnd]
+
+          exception = StackifyProtoBuf::TraceException.new
+          if root_span_hash[:exceptions].count > 0
+            ex = root_span_hash[:exceptions]
+            ex.each do |exc|
+              exception.caught_by = exc[:CaughtBy].to_s
+              exception.exception = exc[:Exception].to_s
+              exception.message = exc[:Message].to_s
+              exception.timestamp_millis = exc[:Timestamp].to_f
+              exc[:Frames].each do |f|
+                trace_ex_frame = StackifyProtoBuf::TraceExceptionFrame.new
+                trace_ex_frame.method = f[:Method].to_s
+                exception.frames.push(trace_ex_frame)
+              end
+              trace_frame.exceptions.push(exception)
+            end
+          end
+
+          # create props
+          root_frame_props = Google::Protobuf::Map.new(:string, :string)
+          root_span_hash[:props].each { |key, value| root_frame_props[key.to_s] = value.to_s }
+          trace_frame.properties = root_frame_props
+
+          add_child_frame trace_frame, root_span_hash
+          trace.frame = trace_frame
+          return trace
+        rescue StandardError => e
+          debug "[Serializers::Transactions] build_protobuf() exception: #{e.inspect}"
+        end
       end
 
       private
 
+      # It accept StackifyProtoBuf::TraceFrame instance and Root span hash
+      # It will create a parent-child structure if there is :stacks found in the current level
+      def add_child_frame(trace_frame, root_span_hash)
+        root_span_hash[:stacks].each do |span|
+          child_frame = StackifyProtoBuf::TraceFrame.new
+          child_frame.call = span[:call].to_s
+          child_frame.start_timestamp_millis = span[:reqBegin]
+          child_frame.end_timestamp_millis = span[:reqEnd]
+
+          map_props = Google::Protobuf::Map.new(:string, :string)
+          span[:props].each { |key, value| map_props[key.to_s] = value.to_s }
+          child_frame.properties = map_props
+
+          trace_frame.frames.push(child_frame)
+          if span[:stacks] && span[:stacks].count > 0
+            add_child_frame child_frame, span
+          end
+        end
+      rescue StandardError => e
+        debug "[Serializers::Transactions] add_child_frame() exception: #{e.inspect}"
+      end
+
       # Add Children Spans to span_json
       def add_children_spans(span_json, children_spans_json)
         id = span_json[:id]

data/lib/stackify_apm/spies/stackify_logger.rb

@@ -5,7 +5,7 @@ module StackifyRubyAPM
   module Spies
     # @api private
     class StackifyLoggerSpy
-      if defined? Stackify
+      if defined?(Stackify) && defined?(::Stackify::LoggerClient)
         ::Stackify::LoggerClient.class_eval do
           require 'securerandom'
           alias_method 'log_message_task_without_apm', 'log_message_task'

data/lib/stackify_apm/subscriber.rb

@@ -12,7 +12,7 @@ module StackifyRubyAPM
     include Log
 
     def initialize(agent)
-      debug '[Subscriber] initialize(agent)' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Subscriber] initialize(agent)' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
       @agent = agent
       @normalizers = Normalizers.build(agent.config)
     end

data/lib/stackify_apm/trace_logger.rb

@@ -13,30 +13,19 @@ module StackifyRubyAPM
     def initialize(config)
       @config = config
       @trace_file_counter = 0
-      @transaction_serializers = Serializers::Transactions.new(config)
+      begin
+        @transaction_serializers = Serializers::Transactions.new(config)
+        @transport = StackifyRubyAPM::TransportSelector.new(@config).transport
+      rescue StandardError => exception
+        debug '[TraceLogger] initialize()' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+        debug exception.inspect
+      end
     end
 
     attr_accessor :trace_file_counter
 
     def post(transactions = [])
-      debug '[TraceLogger] post()' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
-      # convert transactions to json
-      json_traces = []
-      transactions.each  do |transaction|
-        # convert transaction to json
-        json_transaction = @transaction_serializers.build(@config, transaction).to_json
-
-        # add to json traces array
-        json_traces.push(json_transaction)
-      end
-
-      current_datetime = Time.now.utc.strftime('%Y-%m-%d, %H:%M:%S.%6N')
-
-      return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
-
-      json_traces.each do |json_trace|
-        @config.tracer_logger.<<("#{current_datetime} > #{json_trace} \n")
-      end
+      @transport.post(transactions)
     end
   end
 end

data/lib/stackify_apm/transport/agent_base.rb

@@ -0,0 +1,35 @@
+require 'stackify_apm/root_info'
+require 'stackify_apm/serializers'
+
+module StackifyRubyAPM
+  # This class will take care of building a protobuf message.
+  # @api private
+  class AgentBaseTransport
+    include Log
+
+    def initialize(config)
+      @config = config
+      @transaction_serializers = Serializers::Transactions.new(config)
+    end
+
+    # This method will build a group of Stackify::Traces from the protobuf objects.
+    # It accept Array of transactions.
+    def build_message(transactions = [])
+      # convert transactions to protobuf
+      traces = StackifyProtoBuf::Traces.new
+      transactions.each do |transaction|
+        # convert transaction to protobuf
+        protobuf_transaction = @transaction_serializers.build_protobuf(@config, transaction)
+        # add to traces array
+        traces.traces.push(protobuf_transaction)
+      end
+      return traces
+    rescue StandardError => e
+      debug "[AgentBaseTransport] build_message() exception: #{e.inspect}"
+    end
+
+    def post(_transactions = [])
+      raise NotImplementedError
+    end
+  end
+end

data/lib/stackify_apm/transport/agent_http_client.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'faraday'
+require 'ostruct'
+
+module StackifyRubyAPM
+  # This class will handle the sending of protobuf messages through HTTP.
+  # @api private
+  class AgentHTTPClient < AgentBaseTransport
+    include Log
+
+    HEADERS = {
+      'Content-Type' => 'application/x-protobuf'
+    }.freeze
+
+    def initialize(config)
+      @config = config
+      super(config)
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    #
+    # This method will send a protobuf message to HTTP request.
+    # It will accept Array of transactions.
+    def post(transactions = [])
+      debug '[AgentHTTPClient] post()' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+      return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+      max_retries = @config.max_retries
+      retry_count = 0
+      delay = @config.delay_seconds
+      begin
+        protobuf_obj = build_message(transactions)
+        message = StackifyProtoBuf::Traces.encode(protobuf_obj)
+        # Convert message into binary and send it to http request
+        conn = Faraday.new(ssl: { verify: false })
+        response = conn.post do |req|
+          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url)
+          req.headers = HEADERS
+          req.body = message
+        end
+        if response.try(:status) == 200
+          debug '[AgentHTTPClient] Successfully send message via http request.' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+        elsif ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+          debug "[AgentHTTPClient] Failure sending via http request: #{response.inspect}"
+        end
+      rescue StandardError => e
+        debug '[AgentHTTPClient] All retries are exhausted!' if retry_count >= max_retries
+        retry_count += 1
+        if retry_count < max_retries
+          debug "[AgentHTTPClient] post() exception: #{e.inspect}"
+          debug "[AgentHTTPClient] An error occured. Retries left: #{max_retries - retry_count}"
+        end
+        sleep delay += retry_count
+        retry if retry_count < max_retries + 1
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+  end
+end

data/lib/stackify_apm/transport/log_client.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'stackify_apm/root_info'
+require 'stackify_apm/serializers'
+
+module StackifyRubyAPM
+  # This class will handle the writing of messages through a logfile.
+  # @api private
+  class LogClient
+    include Log
+
+    def initialize(config)
+      @config = config
+      @transaction_serializers = Serializers::Transactions.new(@config)
+    end
+
+    # This method will build an Array of Transactions in a json format.
+    # It will accept Array of transactions.
+    def post(transactions = [])
+      # convert transactions to json
+      json_traces = []
+      transactions.each  do |transaction|
+        # convert transaction to json
+        json_transaction = @transaction_serializers.build_json(@config, transaction).to_json
+
+        # add to json traces array
+        json_traces.push(json_transaction)
+      end
+
+      current_datetime = Time.now.utc.strftime('%Y-%m-%d, %H:%M:%S.%6N')
+
+      return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+
+      json_traces.each do |json_trace|
+        @config.tracer_logger.<<("#{current_datetime} > #{json_trace} \n")
+      end
+      debug '[LogClient] post() Successfully write to logfile.' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+    rescue StandardError => e
+      debug "[LogClient] post() exception: #{e.inspect}"
+    end
+  end
+end

data/lib/stackify_apm/transport/unix_socket_client.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'net_http_unix'
+require 'ostruct'
+
+module StackifyRubyAPM
+  # This class will handle the sending of protobuf messages through unix domain socket.
+  # @api private
+  class UnixSocketClient < AgentBaseTransport
+    include Log
+
+    def initialize(config)
+      @config = config
+      super(config)
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    #
+    # This method will send a protobuf message to the unix domain socket.
+    # It will accept Array of transactions.
+    def post(transactions = [])
+      debug '[UnixSocketClient] post()' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+      return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
+      max_retries = @config.max_retries
+      retry_count = 0
+      delay = @config.delay_seconds
+      begin
+        # Convert message into binary and send it to unix domain socket
+        protobuf_obj = build_message(transactions)
+        message = StackifyProtoBuf::Traces.encode(protobuf_obj)
+        client = NetX::HTTPUnix.new('unix://' + @config.unix_socket_path)
+        req = Net::HTTP::Post.new(@config.agent_traces_url)
+        req.set_content_type('application/x-protobuf')
+        req.body = message
+        response = client.request(req)
+        debug "[UnixSocketClient] status_code = #{response.code}" if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+        if response.code.to_i == 200
+          debug '[UnixSocketClient] Successfully sent message via unix domain socket.' if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+        elsif ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
+          debug "[UnixSocketClient] Failure sending via unix domain socket: #{response.inspect}"
+        end
+      rescue StandardError => e
+        debug '[UnixSocketClient] All retries are exhausted!' if retry_count >= max_retries
+        retry_count += 1
+        if retry_count < max_retries
+          debug "[UnixSocketClient] post() exception: #{e.inspect}"
+          debug "[UnixSocketClient] An error occured. Retries left: #{max_retries - retry_count}"
+        end
+        sleep delay += retry_count
+        retry if retry_count < max_retries + 1
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+  end
+end

data/lib/stackify_apm/transport_selector.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# This class handle the selection of the Transport.
+
+module StackifyRubyAPM
+  # @api private
+  class TransportSelector
+    attr_reader :transport
+
+    def initialize(config)
+      @transport =
+        case config.transport.strip.downcase
+        when StackifyRubyAPM::UNIX_SOCKET
+          StackifyRubyAPM::UnixSocketClient.new(config)
+        when StackifyRubyAPM::AGENT_HTTP
+          StackifyRubyAPM::AgentHTTPClient.new(config)
+        else
+          StackifyRubyAPM::LogClient.new(config)
+        end
+    end
+  end
+end

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/lib/stackify_apm/worker.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This class will receive the transactions and send it to HTTP/TraceLogger.
-# Responsible for sending transactions to APM for every 10 secs (config.flush_interval default)
+# Responsible for sending transactions to APM for every 1 secs (config.flush_interval_seconds default)
 # Worker will constantly execute transaction sending to APM until the Agent is stopped.
 
 require 'concurrent/timer_task'
@@ -66,11 +66,11 @@ module StackifyRubyAPM
       Thread.exit
     end
 
-    # flush_interval - interval with which transactions should be sent to the APM. Default value: 10 seconds
+    # flush_interval_seconds - interval with which transactions should be sent to the APM.
     # The running task responsible for initiating the transactions sending
     #
     def build_timer_task
-      Concurrent::TimerTask.new(execution_interval: config.flush_interval) do
+      Concurrent::TimerTask.new(execution_interval: config.flush_interval_seconds) do
         messages.push(FlushMsg.new)
       end
     end
@@ -81,7 +81,7 @@ module StackifyRubyAPM
     def collect_and_send_transactions
       return if pending_transactions.empty?
       transactions = collect_batched_transactions
-      debug '[Worker] collect_and_send_transactions() transactions : ' + transactions.inspect.to_s if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Worker] collect_and_send_transactions() transactions : ' + transactions.inspect.to_s if ENV['STACKIFY_TRANSPORT_LOG_LEVEL'] == '0'
       begin
         @trace_logger.post(transactions)
       rescue ::Exception => e

data/lib/stackify_ruby_apm.rb

@@ -28,6 +28,14 @@ require 'stackify_apm/internal_error'
 require 'stackify_apm/response_manipulator'
 require 'stackify_apm/middleware'
 require 'stackify_apm/instrumenter_helper'
+require 'stackify_apm/transport_selector'
+require 'stackify_apm/transport/agent_base'
+require 'stackify_apm/transport/log_client'
+require 'stackify_apm/transport/unix_socket_client'
+require 'stackify_apm/transport/agent_http_client'
+
+require 'google/protobuf'
+require 'proto/stackify_trace'
 
 # Checks if the framework using is Rails
 require 'stackify_apm/railtie' if defined?(::Rails::Railtie)

data/stackify-ruby-apm.gemspec

@@ -26,5 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_dependency('concurrent-ruby', '~> 1.0')
   spec.add_dependency('delegate_matcher', '~> 0.4')
+  spec.add_dependency('faraday', '~> 0.8')
+  spec.add_dependency('google-protobuf', '3.5.0')
+  spec.add_dependency('net_http_unix', '~> 0.2')
   spec.add_dependency('rufus-scheduler', '~> 3.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: google-protobuf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: net_http_unix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +154,7 @@ files:
 - README.md
 - Rakefile
 - docker-compose.yml
+- lib/proto/stackify_trace.rb
 - lib/stackify-ruby-apm.rb
 - lib/stackify_apm/agent.rb
 - lib/stackify_apm/config.rb
@@ -173,6 +216,11 @@ files:
 - lib/stackify_apm/subscriber.rb
 - lib/stackify_apm/trace_logger.rb
 - lib/stackify_apm/transaction.rb
+- lib/stackify_apm/transport/agent_base.rb
+- lib/stackify_apm/transport/agent_http_client.rb
+- lib/stackify_apm/transport/log_client.rb
+- lib/stackify_apm/transport/unix_socket_client.rb
+- lib/stackify_apm/transport_selector.rb
 - lib/stackify_apm/util.rb
 - lib/stackify_apm/util/dig.rb
 - lib/stackify_apm/util/inflector.rb