appoptics_apm 4.8.0 → 4.9.0

data/lib/appoptics_apm/version.rb

@@ -7,7 +7,7 @@ module AppOpticsAPM
   # appoptics_apm.gemspec during gem build process
   module Version
     MAJOR = 4 # breaking,
-    MINOR = 8 # feature,
+    MINOR = 9 # feature,
     PATCH = 0 # fix => BFF
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/rails/generators/appoptics_apm/templates/appoptics_apm_initializer.rb

@@ -50,7 +50,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:verbose] = false
 
   #
-  # Turn tracing on or off
+  # Turn Tracing on or off
   #
   # By default tracing is set to :enabled, the other option is :disabled.
   # :enabled means that sampling will be done according to the current
@@ -61,31 +61,41 @@ if defined?(AppOpticsAPM::Config)
   #
   AppOpticsAPM::Config[:tracing_mode] = :enabled
 
+  #
+  # Turn Trigger Tracing on or off
+  #
+  # By default trigger tracing is :enabled, the other option is :disabled.
+  # It allows to use the X-Trace-Options header to force a request to be
+  # traced (within rate limits set for trigger tracing)
+  #
+  AppOpticsAPM::Config[:trigger_tracing_mode] = :enabled
+
   #
   # Trace Context in Logs
   #
-  # Configure if and when the traceId should be included in application logs.
+  # Configure if and when the Trace ID should be included in application logs.
   # Common Ruby and Rails loggers are auto-instrumented, so that they can include
-  # the current traceId in log messages.
+  # the current Trace ID in log messages.
   #
   # The added string will look like: "ao.traceId=7435A9FE510AE4533414D425DADF4E180D2B4E36-0"
   # It ends in '-1' if the request is sampled and in '-0' otherwise.
   #
   # The following options are available:
   # :never    (default)
-  # :sampled  only include the traceId of sampled requests
-  # :traced   include the traceId for all traced requests
-  # :always   always add a traceId, it will be '0000000000000000000000000000000000000000-0'
+  # :sampled  only include the Trace ID of sampled requests
+  # :traced   include the Trace ID for all traced requests
+  # :always   always add a Trace ID, it will be '0000000000000000000000000000000000000000-0'
   #           when there is no tracing context.
   #
   AppOpticsAPM::Config[:log_traceId] = :never
 
   #
-  # Prepend domain to transaction name
+  # Prepend Domain to Transaction Name
   #
-  # If this is set to `true` transaction names will be composed as `my.host.com/controller.action` instead of
-  # `controller.action`. This configuration applies to all transaction names, whether deduced by the instrumentation
-  # or implicitly set.
+  # If this is set to `true` transaction names will be composed as
+  # `my.host.com/controller.action` instead of `controller.action`.
+  # This configuration applies to all transaction names, whether deduced by the
+  # instrumentation or implicitly set.
   #
   AppOpticsAPM::Config[:transaction_name][:prepend_domain] = false
 
@@ -195,6 +205,21 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:report_rescued_errors] = false
   #
 
+  #
+  # EC2 Metadata Fetching Timeout
+  #
+  # The timeout can be in the range 0 - 3000 (milliseconds)
+  # Setting to 0 milliseconds effectively disables fetching from
+  # the metadata URL (not waiting), and should only be used if
+  # not running on EC2 / Openstack to minimize agent start up time.
+  #
+  AppOpticsAPM::Config[:ec2_metadata_timeout] = 1000
+
+
+  #############################################
+  ## SETTINGS FOR INDIVIDUAL GEMS/FRAMEWORKS ##
+  #############################################
+
   #
   # Bunny Controller and Action
   #
@@ -235,7 +260,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:dalli][:enabled] = true
   AppOpticsAPM::Config[:delayed_jobclient][:enabled] = true
   AppOpticsAPM::Config[:delayed_jobworker][:enabled] = true
-  AppOpticsAPM::Config[:em_http_request][:enabled] = false
+  # AppOpticsAPM::Config[:em_http_request][:enabled] = false # not supported anymore
   AppOpticsAPM::Config[:excon][:enabled] = true
   AppOpticsAPM::Config[:faraday][:enabled] = true
   AppOpticsAPM::Config[:grpc_client][:enabled] = true
@@ -301,7 +326,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:dalli][:collect_backtraces] = false
   AppOpticsAPM::Config[:delayed_jobclient][:collect_backtraces] = false
   AppOpticsAPM::Config[:delayed_jobworker][:collect_backtraces] = false
-  AppOpticsAPM::Config[:em_http_request][:collect_backtraces] = true
+  # AppOpticsAPM::Config[:em_http_request][:collect_backtraces] = true # not supported anymore
   AppOpticsAPM::Config[:excon][:collect_backtraces] = true
   AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
   AppOpticsAPM::Config[:grape][:collect_backtraces] = true

data/oboe.code-workspace

@@ -0,0 +1,66 @@
+{
+	"folders": [
+		{
+			"path": "/Users/maiaengeli/workspace/librato/oboe/liboboe"
+		}
+	],
+	"settings": {
+		"files.associations": {
+			"iosfwd": "c",
+			"rope": "c",
+			"*.ipp": "cpp",
+			"array": "cpp",
+			"hash_map": "cpp",
+			"deque": "cpp",
+			"list": "cpp",
+			"unordered_map": "cpp",
+			"unordered_set": "cpp",
+			"vector": "cpp",
+			"slist": "cpp",
+			"initializer_list": "cpp",
+			"string_view": "cpp",
+			"valarray": "cpp",
+			"*.tcc": "cpp",
+			"cctype": "cpp",
+			"clocale": "cpp",
+			"cmath": "cpp",
+			"cstdarg": "cpp",
+			"cstdint": "cpp",
+			"cstdio": "cpp",
+			"cstdlib": "cpp",
+			"cwchar": "cpp",
+			"cwctype": "cpp",
+			"exception": "cpp",
+			"iostream": "cpp",
+			"istream": "cpp",
+			"limits": "cpp",
+			"new": "cpp",
+			"ostream": "cpp",
+			"sstream": "cpp",
+			"stdexcept": "cpp",
+			"streambuf": "cpp",
+			"system_error": "cpp",
+			"cinttypes": "cpp",
+			"type_traits": "cpp",
+			"typeinfo": "cpp",
+			"tuple": "cpp",
+			"utility": "cpp",
+			"cstddef": "cpp",
+			"cstring": "cpp",
+			"ctime": "cpp",
+			"fstream": "cpp",
+			"functional": "cpp",
+			"memory": "cpp",
+			"optional": "cpp",
+			"chrono": "cpp",
+			"atomic": "cpp",
+			"codecvt": "cpp",
+			"condition_variable": "cpp",
+			"csignal": "cpp",
+			"iomanip": "cpp",
+			"mutex": "cpp",
+			"ratio": "cpp",
+			"thread": "cpp"
+		}
+	}
+}

data/scrap.rb

@@ -0,0 +1,134 @@
+# Gemfile
+#
+# source "https://rubygems.org"
+#
+# gem 'rails', '~> 6.0.0'
+# gem 'puma'
+# gem 'pg'
+
+
+
+require "rails"
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "action_cable/engine"
+require "rails/test_unit/railtie"
+
+require 'rack/handler/puma'
+
+
+# adjust this or comment out if you have a config/database.yml
+ENV['DATABASE_URL'] = "postgresql://docker:#{ENV['DOCKER_PSQL_PASS']}@127.0.0.1:5432/travis_ci_test"
+ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+
+
+module Rails50APIStack
+  class Application < Rails::Application
+    config.api_only = true
+
+    routes.append do
+      get "/monkey/hello" => "monkey#hello"
+      get "/monkey/error" => "monkey#error"
+    end
+
+    config.cache_classes = true
+    config.eager_load = false
+    config.active_support.deprecation = :stderr
+    config.middleware.delete Rack::Lock
+    config.middleware.delete ActionDispatch::Flash
+    config.secret_token = "48837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    config.secret_key_base = "2049671-96803948"
+  end
+end
+
+class MonkeyController < ActionController::API
+  def hello
+    render :plain => {:Response => "Hello API!"}.to_json, content_type: 'application/json'
+  end
+
+  def error
+    raise "Rails API fake error from controller"
+  end
+end
+
+Rails50APIStack::Application.initialize!
+
+Thread.new do
+  Rack::Handler::Puma.run(Rails50APIStack::Application.to_app, {:Host => '127.0.0.1', :Port => 8150})
+end
+
+
+class Rails50Stack
+  class Application < Rails::Application
+    routes.append do
+      get "/hello/world"       => "hello#world"
+    end
+
+    config.cache_classes = true
+    config.eager_load = false
+    config.active_support.deprecation = :stderr
+    config.middleware.delete Rack::Lock
+    config.middleware.delete ActionDispatch::Flash
+    config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    config.secret_key_base = "2048671-96803948"
+  end
+end
+
+class HelloController < ActionController::Base
+  def world
+    render :plain => "Hello world!"
+  end
+end
+
+Rails50Stack::Application.initialize!
+
+Thread.new do
+  Rack::Handler::Puma.run(Rails50Stack::Application.to_app, {:Host => '127.0.0.1', :Port => 8140})
+end
+
+sleep(2)
+
+# module Aaaa
+#   def do(arg)
+#     puts "#{arg} AAAA "
+#     super
+#   end
+# end
+#
+# module Bbbb
+#   include Aaaa
+#
+#   def do(arg)
+#     puts "#{arg} BBBB "
+#     super
+#   end
+# end
+#
+# class Cccc
+#   prepend Aaaa
+#
+#   def do(arg)
+#     puts "#{arg} CCCC "
+#     # super
+#   end
+# end
+#
+# class Zzzz < Cccc
+#   # prepend Aaaa
+#   prepend Bbbb
+#
+#   def do(arg)
+#     puts "#{arg} ZZZZ PI "
+#     super
+#   end
+# end
+#
+# sleep 60
+# puts Zzzz.ancestors
+# Zzzz.new.do('hhhhmmmm? ')
+
+

data/scrap_gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 6.0.0'
+gem 'puma'
+gem 'pg'

data/scrap_gemfile.lock

@@ -0,0 +1,140 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    erubi (1.8.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nio4r (2.4.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.4)
+    puma (4.1.0)
+      nio4r (~> 2.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.1.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pg
+  puma
+  rails (~> 6.0.0)
+
+BUNDLED WITH
+   1.17.3