appoptics_apm 4.12.1 → 4.12.2

data/lib/appoptics_apm/support/transaction_settings.rb

@@ -55,7 +55,7 @@ module AppOpticsAPM
         args << options.timestamp
       end
 
-      metrics, sample, @rate, @source, @type, @auth, @status_msg, @auth_msg, @status =
+      metrics, sample, @rate, @source, @bucket_rate, @bucket_cap, @type, @auth, @status_msg, @auth_msg, @status =
         AppOpticsAPM::Context.getDecisions(*args)
 
       if @status > AO_TRACING_DECISIONS_OK

data/lib/appoptics_apm/test.rb

@@ -54,13 +54,12 @@ module AppOpticsAPM
         if ENV.key?('TRAVIS_PSQL_PASS')
           ENV['DATABASE_URL'] = "postgresql://postgres:#{ENV['TRAVIS_PSQL_PASS']}@127.0.0.1:5432/travis_ci_test"
         elsif ENV.key?('POSTGRES_USER')
-          ENV['DATABASE_URL'] = "postgresql://#{ENV['POSTGRES_USER']}@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
+          ENV['DATABASE_URL'] = "postgresql://#{ENV['POSTGRES_PASSWORD']}:#{ENV['POSTGRES_USER']}@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
           # ENV['DATABASE_URL'] = "postgresql://postgres@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
         else
           ENV['DATABASE_URL'] = 'postgresql://postgres@127.0.0.1:5432/travis_ci_test'
         end
       end
-
       ##
       # set_mysql_env
       #

data/lib/appoptics_apm/util.rb

@@ -271,12 +271,13 @@ module AppOpticsAPM
           platform_info['Force']                        = true
           platform_info['Ruby.Platform.Version']        = RUBY_PLATFORM
           platform_info['Ruby.Version']                 = RUBY_VERSION
-          platform_info['Ruby.AppOptics.Version']    = AppOpticsAPM::Version::STRING
+          platform_info['Ruby.AppOptics.Version']       = AppOpticsAPM::Version::STRING
 
+          # oboe not loaded yet, can't use oboe_api function to read oboe VERSION
           clib_version_file = File.join(Gem::Specification.find_by_name('appoptics_apm').gem_dir, 'ext', 'oboe_metal', 'src', 'VERSION')
-          platform_info['Ruby.clib.Version']            = File.read(clib_version_file).chomp
+          platform_info['Ruby.AppOpticsExtension.Version'] = File.read(clib_version_file).chomp
           platform_info['RubyHeroku.AppOpticsAPM.Version'] = AppOpticsAPMHeroku::Version::STRING if defined?(AppOpticsAPMHeroku)
-          platform_info['Ruby.TraceMode.Version']       = AppOpticsAPM::Config[:tracing_mode]
+          platform_info['Ruby.TraceMode.Version']          = AppOpticsAPM::Config[:tracing_mode]
 
           # Collect up the loaded gems
           if defined?(Gem) && Gem.respond_to?(:loaded_specs)

data/lib/appoptics_apm/version.rb

@@ -6,10 +6,11 @@ module AppOpticsAPM
   # The current version of the gem.  Used mainly by
   # appoptics_apm.gemspec during gem build process
   module Version
-    MAJOR = 4 # breaking,
+    MAJOR = 4  # breaking,
     MINOR = 12 # feature,
-    PATCH = 1 # fix => BFF
+    PATCH = 2  # fix => BFF
+    PRE   = nil
 
-    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end
 end

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

@@ -10,7 +10,9 @@
 
 if defined?(AppOpticsAPM::Config)
 
-  # :service_key, :hostname_alias, and :debug_level are startup settings and can't be changed afterwards.
+  # :service_key, :hostname_alias, :http_proxy, and :debug_level
+  # are startup settings and can't be changed afterwards.
+
   #
   # Set APPOPTICS_SERVICE_KEY
   # This setting will be overridden if APPOPTICS_SERVICE_KEY is set as an environment variable.
@@ -27,6 +29,28 @@ if defined?(AppOpticsAPM::Config)
   #
   # AppOpticsAPM::Config[:hostname_alias] = 'alias_name'
 
+  #
+  # Set Proxy for AppOptics
+  # This setting will be overridden if APPOPTICS_PROXY is set as an environment variable.
+  #
+  # Please configure http_proxy if a proxy needs to be used to communicate with
+  # the AppOptics backend.
+  # The format should either be http://<proxyHost>:<proxyPort> for a proxy
+  # server that does not require authentication, or
+  # http://<username>:<password>@<proxyHost>:<proxyPort> for a proxy server that
+  # requires basic authentication.
+  #
+  # Note that while HTTP is the only type of connection supported, the traffic
+  # to AppOptics is still encrypted using SSL/TLS.
+  #
+  # It is recommended to configure the proxy in this file or as APPOPTICS_PROXY
+  # environment variable. However, the agent's underlying network library will
+  # use a system-wide proxy defined in the environment variables grpc_proxy,
+  # https_proxy or http_proxy if no AppOptics-specific configuration is set.
+  # Please refer to gRPC environment variables for more information.
+  #
+  # AppOpticsAPM::Config[:http_proxy] = http://<proxyHost>:<proxyPort>
+
   #
   # Set APPOPTICS_DEBUG_LEVEL
   # This setting will be overridden if APPOPTICS_DEBUG_LEVEL is set as an environment variable.
@@ -36,6 +60,7 @@ if defined?(AppOpticsAPM::Config)
   # Values out of range (< -1 or > 6) are ignored and the log level is set to the default (info).
   #
   AppOpticsAPM::Config[:debug_level] = 3
+
   #
   # :debug_level will be used in the c-extension of the gem and also mapped to the
   # Ruby logger as DISABLED, FATAL, ERROR, WARN, INFO, or DEBUG

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.12.1
+  version: 4.12.2
 platform: ruby
 authors:
 - Maia Engeli
 - Peter Giacomo Lombardo
 - Spiros Eliopoulos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,20 +30,20 @@ dependencies:
   name: no_proxy_fix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: 'Automatic tracing and metrics for Ruby applications. Get started at
@@ -80,10 +80,12 @@ files:
 - ext/oboe_metal/src/VERSION
 - ext/oboe_metal/src/bson/bson.h
 - ext/oboe_metal/src/bson/platform_hacks.h
+- ext/oboe_metal/src/init_appoptics_apm.cc
 - ext/oboe_metal/src/oboe.h
-- ext/oboe_metal/src/oboe.hpp
+- ext/oboe_metal/src/oboe_api.cpp
+- ext/oboe_metal/src/oboe_api.hpp
 - ext/oboe_metal/src/oboe_debug.h
-- ext/oboe_metal/src/oboe_wrap.cxx
+- ext/oboe_metal/src/oboe_swig_wrap.cc
 - init.rb
 - lib/appoptics_apm.rb
 - lib/appoptics_apm/api.rb
@@ -171,13 +173,13 @@ files:
 - yardoc_frontpage.md
 homepage: https://www.appoptics.com/
 licenses:
-- Librato Open License, Version 1.0, https://bit.ly/2Kmm0mN
+- Apache-2.0
 metadata:
   changelog_uri: https://github.com/appoptics/appoptics-apm-ruby/releases
   documentation_uri: https://docs.appoptics.com/kb/apm_tracing/ruby/
   homepage_uri: https://www.appoptics.com/
   source_code_uri: https://github.com/appoptics/appoptics-apm-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,9 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: AppOptics APM performance instrumentation gem for Ruby
 test_files: []