solarwinds_apm 5.0.0 → 5.1.1.pre

data/ext/oboe_metal/src/profiling.cc

@@ -13,7 +13,7 @@
 
 #include "frames.h"
 #include "logging.h"
-#include "oboe_api.hpp"
+#include "oboe_api.h"
 
 
 #define TIMER_SIG SIGRTMAX        // the timer notification signal

data/ext/oboe_metal/src/profiling.h

@@ -16,7 +16,7 @@
 
 #include "frames.h"
 #include "logging.h"
-#include "oboe_api.hpp"
+#include "oboe_api.h"
 
 #define BUF_SIZE 2048
 

data/lib/rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb

@@ -78,27 +78,6 @@ if defined?(SolarWindsAPM::Config)
   #
   SolarWindsAPM::Config[:verbose] = false
 
-  #
-  # Turn code profiling on or off
-  #
-  # By default profiling is set to :disabled, the other option is :enabled.
-  # :enabled means that any traced code will also be profiled to get deeper insight
-  # into the methods called during a trace.
-  # Profiling in the solarwinds_apm gem is based on the low-overhead, sampling
-  # profiler implemented in stackprof.
-  #
-  SolarWindsAPM::Config[:profiling] = :disabled
-
-  #
-  # Set the profiling interval (in milliseconds)
-  #
-  # The default is 10 milliseconds, which means that the method call stack is
-  # recorded every 10 milliseconds. Shorter intervals may give better insight,
-  # but will incur more overhead.
-  # Minimum: 1, Maximum: 100
-  #
-  SolarWindsAPM::Config[:profiling_interval] = 10
-
   #
   # Turn Tracing on or off
   #
@@ -295,6 +274,7 @@ if defined?(SolarWindsAPM::Config)
   #
   SolarWindsAPM::Config[:ec2_metadata_timeout] = 1000
 
+
   #############################################
   ## SETTINGS FOR INDIVIDUAL GEMS/FRAMEWORKS ##
   #############################################

data/lib/solarwinds_apm/config.rb

@@ -146,6 +146,9 @@ module SolarWindsAPM
       (@@instrumentation+@@ignore).each { |k| @@config[k] = {} }
       @@config[:transaction_name] = {}
 
+      @@config[:profiling] = :disabled
+      @@config[:profiling_interval] = 5
+
       # Always load the template, it has all the keys and defaults defined,
       # no guarantee of completeness in the user's config file
       load(File.join(File.dirname(File.dirname(__FILE__)),
@@ -226,7 +229,12 @@ module SolarWindsAPM
             Regexp.new(SolarWindsAPM::Config[:dnt_regexp], SolarWindsAPM::Config[:dnt_opts] || nil)
         end
 
+      elsif key == :profiling
+        SolarWindsAPM.logger.warn "[solarwinds_apm/config] Profiling feature is currently not available." 
+        @@config[:profiling] = :disabled
+
       elsif key == :profiling_interval
+        SolarWindsAPM.logger.warn "[solarwinds_apm/config] Profiling feature is currently not available. :profiling_interval setting is not configured." 
         if value.is_a?(Integer) && value > 0
           value = [100, value].min
         else
@@ -271,6 +279,7 @@ module SolarWindsAPM
       elsif key == :trigger_tracing_mode
         # Make sure that the mode is stored as a symbol
         @@config[key.to_sym] = value.to_sym
+
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity

data/lib/solarwinds_apm/inst/rack.rb

@@ -63,7 +63,13 @@ if SolarWindsAPM.loaded
         response =
           propagate_tracecontext(env, settings) do
             sample(env, settings, options, profile_spans) do
-              SolarWindsAPM::Profiling.run do
+              if defined?(SolarWindsAPM::Profiling)
+                SolarWindsAPM::Profiling.run do
+                  SolarWindsAPM::TransactionMetrics.metrics(env, settings) do
+                    @app.call(env)
+                  end
+                end
+              else
                 SolarWindsAPM::TransactionMetrics.metrics(env, settings) do
                   @app.call(env)
                 end

data/lib/solarwinds_apm/oboe_init_options.rb

@@ -53,6 +53,8 @@ module SolarWindsAPM
       # hardcoded arg for lambda (lambda not supported yet)
       # hardcoded arg for grpc hack
       # hardcoded arg for trace id format to use w3c format
+      # flag for format of metric (0 = Both; 1 = AppOptics only; 2 = SWO only; default = 0)
+      @metric_format = determine_the_metric_model
     end
 
     def re_init # for testing with changed ENV vars
@@ -83,7 +85,8 @@ module SolarWindsAPM
         @grpc_proxy,             #18
         0,                       #19 arg for lambda (no lambda for ruby yet)
         1,                       #20 arg for grpc hack, hardcoded to include hack
-        1                        #21 arg for trace id format to use w3c format
+        1,                       #21 arg for trace id format to use w3c format
+        @metric_format           #22
       ]
     end
 
@@ -186,6 +189,14 @@ module SolarWindsAPM
 
       proxy
     end
+
+    def determine_the_metric_model
+      if ENV['SW_APM_COLLECTOR']&.include? "appoptics.com"
+        return 1
+      else
+        return 0
+      end
+    end
   end
 end
 

data/lib/solarwinds_apm/support/profiling.rb

@@ -2,6 +2,9 @@
 # All rights reserved.
 
 module SolarWindsAPM
+
+  # *
+  # * This class only got defined if Init_profiling defined in init_solarwinds_apm.cc
   class Profiling
 
     def self.run

data/lib/solarwinds_apm/support.rb

@@ -3,6 +3,7 @@
 
 pattern = File.join(File.dirname(__FILE__), 'support', '*.rb')
 Dir.glob(pattern) do |f|
+  next if f =~ /profiling/ unless defined?(SolarWindsAPM::CProfiler) # ignore defining SolarWindsAPM::Profiling if Init_profiling disabled
   begin
     require f
   rescue => e

data/lib/solarwinds_apm/version.rb

@@ -7,10 +7,9 @@ module SolarWindsAPM
   # solarwinds_apm.gemspec during gem build process
   module Version
     MAJOR  = 5 # breaking,
-    MINOR  = 0 # feature,
-    PATCH  = 0 # fix => BFF
-    PRE    = nil # for pre-releases into packagecloud,
-               # set to nil for production releases into rubygems
+    MINOR  = 1 # feature,
+    PATCH  = 1 # fix => BFF
+    PRE    = "pre" # for pre-releases into packagecloud, set to nil for production releases into rubygems
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/lib/solarwinds_apm.rb

@@ -57,7 +57,7 @@ begin
     SolarWindsAPM.logger.warn '=============================================================='
     require 'solarwinds_apm/noop/context'
     require 'solarwinds_apm/noop/metadata'
-    require 'solarwinds_apm/noop/profiling'
+    # require 'solarwinds_apm/noop/profiling'
     require 'solarwinds_apm/support/trace_string'
   end
 

data/solarwinds_apm.gemspec

@@ -8,26 +8,26 @@ Gem::Specification.new do |s|
 
   s.license = "Apache-2.0"
 
-  s.authors = ["Maia Engeli", "Peter Giacomo Lombardo", "Spiros Eliopoulos"]
+  s.authors = ["Maia Engeli", "Peter Giacomo Lombardo", "Spiros Eliopoulos", "Xuan Cao"]
   s.email = %q{technicalsupport@solarwinds.com}
-  s.homepage = %q{https://cloud.solarwinds.com/}
+  s.homepage = %q{https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html}
   s.summary = %q{SolarWindsAPM performance instrumentation gem for Ruby}
   s.description = <<-EOF
 Automatic tracing and metrics for Ruby applications. Get started at cloud.solarwinds.com
   EOF
 
   s.metadata = {
-      'changelog_uri'     => 'https://github.com/appoptics/appoptics-apm-ruby/releases',
+      'changelog_uri'     => 'https://github.com/solarwindscloud/solarwinds-apm-ruby/releases',
       'documentation_uri' => 'https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent',
-      'homepage_uri'      => 'https://cloud.solarwinds.com/',
-      'source_code_uri'   => 'https://github.com/appoptics/appoptics-apm-ruby',
+      'homepage_uri'      => 'https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html',
+      'source_code_uri'   => 'https://github.com/solarwindscloud/solarwinds-apm-ruby',
   }
 
   s.extra_rdoc_files = ['LICENSE']
   s.files = `git ls-files`.split("\n").reject { |f| f.match(%r{^(test|gemfiles)/}) }
   s.files += ['ext/oboe_metal/src/oboe.h',
               'ext/oboe_metal/src/oboe_api.cpp',
-              'ext/oboe_metal/src/oboe_api.hpp',
+              'ext/oboe_metal/src/oboe_api.h',
               'ext/oboe_metal/src/oboe_debug.h',
               'ext/oboe_metal/src/oboe_swig_wrap.cc',
               'ext/oboe_metal/src/bson/bson.h',

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1.pre
 platform: ruby
 authors:
 - Maia Engeli
 - Peter Giacomo Lombardo
 - Spiros Eliopoulos
+- Xuan Cao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -59,6 +60,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".dockerignore"
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE/bug-or-feature-request.md"
 - ".github/workflows/build_and_release_gem.yml"
 - ".github/workflows/build_for_packagecloud.yml"
@@ -70,7 +72,9 @@ files:
 - ".github/workflows/test_on_4_linux.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".whitesource"
 - ".yardopts"
+- CHANGELOG-appoptics.md
 - CHANGELOG.md
 - CONFIG.md
 - Gemfile
@@ -97,7 +101,7 @@ files:
 - ext/oboe_metal/src/logging.h
 - ext/oboe_metal/src/oboe.h
 - ext/oboe_metal/src/oboe_api.cpp
-- ext/oboe_metal/src/oboe_api.hpp
+- ext/oboe_metal/src/oboe_api.h
 - ext/oboe_metal/src/oboe_debug.h
 - ext/oboe_metal/src/oboe_swig_wrap.cc
 - ext/oboe_metal/src/profiling.cc
@@ -198,14 +202,14 @@ files:
 - log/postgresql/.keep
 - solarwinds_apm.gemspec
 - yardoc_frontpage.md
-homepage: https://cloud.solarwinds.com/
+homepage: https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://github.com/appoptics/appoptics-apm-ruby/releases
+  changelog_uri: https://github.com/solarwindscloud/solarwinds-apm-ruby/releases
   documentation_uri: https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent
-  homepage_uri: https://cloud.solarwinds.com/
-  source_code_uri: https://github.com/appoptics/appoptics-apm-ruby
+  homepage_uri: https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html
+  source_code_uri: https://github.com/solarwindscloud/solarwinds-apm-ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -217,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: