solarwinds_apm 6.0.0.preV1 → 6.0.0.preV2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b2c4b54eaff62c93db5c06ebd9e85f73aea61943fa8eb90f0ba157dc81ab01
-  data.tar.gz: 2133540e0d8ec4ab097cd638d0cfd834649bc4898555ffb9cbfd7fa58a6e2355
+  metadata.gz: 4f218890396745c5ba75f0819fa07e3717014fe7aa4072136cf62c23bcbadf34
+  data.tar.gz: b02cde4d6b896bc60da7fe2c1ab67fd01500a97073d6b67cae497eca70773fa7
 SHA512:
-  metadata.gz: 2731e533815670079641e91865a502157162a4924d4c1c0950b50f3e42d7417619305f51a2db22f12ef45ea9111b826d59bcd091f9201b1375afdb06e940421a
-  data.tar.gz: 6c2053e792310de17c09a58b68e8b74ba100a01c025d703d8cee315b7c3ad7ae6f23da08fe0b5dda2a6328a710330c6ce1468db12703c4d16ce98f1564df5436
+  metadata.gz: f699da24367449958aaff9900c3a0e6ef312917a98df5eda9fd7694a7ccf0f4b27a4f9ff02c3b855d89f2360215b6b0e0b3cfcb541f3b34cc05f7c6de468520f
+  data.tar.gz: 65b88f0502aadd4e1e0fda69e39c73350efc100c5a64d226ccd474aa11409af8fd40a5ee1f5735516a2fd7ac5fc20fb16e5f8140c2550029bf8fafdd049d0002

data/LICENSE

@@ -1,17 +1,18 @@
-                                 Apache License
+ 
+                                Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
-
+ 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
+ 
    1. Definitions.
-
+ 
       "License" shall mean the terms and conditions for use, reproduction,
       and distribution as defined by Sections 1 through 9 of this document.
-
+ 
       "Licensor" shall mean the copyright owner or entity authorized by
       the copyright owner that is granting the License.
-
+ 
       "Legal Entity" shall mean the union of the acting entity and all
       other entities that control, are controlled by, or are under common
       control with that entity. For the purposes of this definition,
@@ -19,24 +20,24 @@
       direction or management of such entity, whether by contract or
       otherwise, or (ii) ownership of fifty percent (50%) or more of the
       outstanding shares, or (iii) beneficial ownership of such entity.
-
+ 
       "You" (or "Your") shall mean an individual or Legal Entity
       exercising permissions granted by this License.
-
+ 
       "Source" form shall mean the preferred form for making modifications,
       including but not limited to software source code, documentation
       source, and configuration files.
-
+ 
       "Object" form shall mean any form resulting from mechanical
       transformation or translation of a Source form, including but
       not limited to compiled object code, generated documentation,
       and conversions to other media types.
-
+ 
       "Work" shall mean the work of authorship, whether in Source or
       Object form, made available under the License, as indicated by a
       copyright notice that is included in or attached to the work
       (an example is provided in the Appendix below).
-
+ 
       "Derivative Works" shall mean any work, whether in Source or Object
       form, that is based on (or derived from) the Work and for which the
       editorial revisions, annotations, elaborations, or other modifications
@@ -44,7 +45,7 @@
       of this License, Derivative Works shall not include works that remain
       separable from, or merely link (or bind by name) to the interfaces of,
       the Work and Derivative Works thereof.
-
+ 
       "Contribution" shall mean any work of authorship, including
       the original version of the Work and any modifications or additions
       to that Work or Derivative Works thereof, that is intentionally
@@ -58,18 +59,18 @@
       Licensor for the purpose of discussing and improving the Work, but
       excluding communication that is conspicuously marked or otherwise
       designated in writing by the copyright owner as "Not a Contribution."
-
+ 
       "Contributor" shall mean Licensor and any individual or Legal Entity
       on behalf of whom a Contribution has been received by Licensor and
       subsequently incorporated within the Work.
-
+ 
    2. Grant of Copyright License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
       copyright license to reproduce, prepare Derivative Works of,
       publicly display, publicly perform, sublicense, and distribute the
       Work and such Derivative Works in Source or Object form.
-
+ 
    3. Grant of Patent License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
@@ -85,24 +86,24 @@
       or contributory patent infringement, then any patent licenses
       granted to You under this License for that Work shall terminate
       as of the date such litigation is filed.
-
+ 
    4. Redistribution. You may reproduce and distribute copies of the
       Work or Derivative Works thereof in any medium, with or without
       modifications, and in Source or Object form, provided that You
       meet the following conditions:
-
+ 
       (a) You must give any other recipients of the Work or
           Derivative Works a copy of this License; and
-
+ 
       (b) You must cause any modified files to carry prominent notices
           stating that You changed the files; and
-
+ 
       (c) You must retain, in the Source form of any Derivative Works
           that You distribute, all copyright, patent, trademark, and
           attribution notices from the Source form of the Work,
           excluding those notices that do not pertain to any part of
           the Derivative Works; and
-
+ 
       (d) If the Work includes a "NOTICE" text file as part of its
           distribution, then any Derivative Works that You distribute must
           include a readable copy of the attribution notices contained
@@ -119,14 +120,14 @@
           or as an addendum to the NOTICE text from the Work, provided
           that such additional attribution notices cannot be construed
           as modifying the License.
-
+ 
       You may add Your own copyright statement to Your modifications and
       may provide additional or different license terms and conditions
       for use, reproduction, or distribution of Your modifications, or
       for any such Derivative Works as a whole, provided Your use,
       reproduction, and distribution of the Work otherwise complies with
       the conditions stated in this License.
-
+ 
    5. Submission of Contributions. Unless You explicitly state otherwise,
       any Contribution intentionally submitted for inclusion in the Work
       by You to the Licensor shall be under the terms and conditions of
@@ -134,12 +135,12 @@
       Notwithstanding the above, nothing herein shall supersede or modify
       the terms of any separate license agreement you may have executed
       with Licensor regarding such Contributions.
-
+ 
    6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
       except as required for reasonable and customary use in describing the
       origin of the Work and reproducing the content of the NOTICE file.
-
+ 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
       Contributor provides its Contributions) on an "AS IS" BASIS,
@@ -149,7 +150,7 @@
       PARTICULAR PURPOSE. You are solely responsible for determining the
       appropriateness of using or redistributing the Work and assume any
       risks associated with Your exercise of permissions under this License.
-
+ 
    8. Limitation of Liability. In no event and under no legal theory,
       whether in tort (including negligence), contract, or otherwise,
       unless required by applicable law (such as deliberate and grossly
@@ -161,7 +162,7 @@
       work stoppage, computer failure or malfunction, or any and all
       other commercial damages or losses), even if such Contributor
       has been advised of the possibility of such damages.
-
+ 
    9. Accepting Warranty or Additional Liability. While redistributing
       the Work or Derivative Works thereof, You may choose to offer,
       and charge a fee for, acceptance of support, warranty, indemnity,
@@ -171,31 +172,4 @@
       of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+      of your accepting any such warranty or additional liability.

data/ext/oboe_metal/extconf.rb

@@ -21,54 +21,54 @@ ext_dir = __dir__
 
 # Set the mkmf lib paths so we have no issues linking to
 # the SolarWindsAPM libs.
-ao_lib_dir = File.join(ext_dir, 'lib')
-ao_include = File.join(ext_dir, 'src')
+swo_lib_dir = File.join(ext_dir, 'lib')
+swo_include = File.join(ext_dir, 'src')
 
 # Download the appropriate liboboe from Staging or Production
-version = File.read(File.join(ao_include, 'VERSION')).strip
+version = File.read(File.join(swo_include, 'VERSION')).strip
 if ENV['OBOE_DEV'].to_s.downcase == 'true'
-  ao_path = "https://solarwinds-apm-staging.s3.us-west-2.amazonaws.com/apm/c-lib/nightly"
+  swo_path = "https://solarwinds-apm-staging.s3.us-west-2.amazonaws.com/apm/c-lib/nightly"
   puts 'Fetching c-lib from DEVELOPMENT Build'
 elsif ENV['OBOE_STAGING'].to_s.downcase == 'true'
-  ao_path = File.join('https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/', version)
+  swo_path = File.join('https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib/', version)
   puts 'Fetching c-lib from STAGING'
 else
-  ao_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
+  swo_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
 end
 
-ao_arch = 'x86_64'
+swo_arch = 'x86_64'
 system_arch = `uname -m` # for mac, the command is `uname` # "Darwin\n"; try `uname -a`
 case system_arch.gsub("\n","")
 when 'x86_64'
-  ao_arch = 'x86_64'
+  swo_arch = 'x86_64'
 when 'aarch64'
-  ao_arch = 'aarch64'
+  swo_arch = 'aarch64'
 end
 
 if File.exist?('/etc/alpine-release')
   version = File.read('/etc/alpine-release').strip
 
-  tmp_ao_arch = ao_arch.clone
-  ao_arch =
+  tmp_swo_arch = swo_arch.clone
+  swo_arch =
     if Gem::Version.new(version) < Gem::Version.new('3.9')
-      "alpine-libressl-#{tmp_ao_arch}"
+      "alpine-libressl-#{tmp_swo_arch}"
     else # openssl
-      "alpine-#{tmp_ao_arch}"
+      "alpine-#{tmp_swo_arch}"
     end
 end
 
-ao_clib = "liboboe-1.0-#{ao_arch}.so"
-ao_item = File.join(ao_path, ao_clib)
-ao_checksum_file = File.join(ao_lib_dir, "#{ao_clib}.sha256")
-clib = File.join(ao_lib_dir, ao_clib)
+swo_clib = "liboboe-1.0-#{swo_arch}.so"
+swo_item = File.join(swo_path, swo_clib)
+swo_checksum_file = File.join(swo_lib_dir, "#{swo_clib}.sha256")
+clib = File.join(swo_lib_dir, swo_clib)
 
 retries = 3
 success = false
 while retries > 0
   begin
-    IO.copy_stream(URI.parse(ao_item).open, clib)
+    IO.copy_stream(URI.parse(swo_item).open, clib)
     clib_checksum = Digest::SHA256.file(clib).hexdigest
-    checksum      =  File.read(ao_checksum_file).strip
+    checksum      =  File.read(swo_checksum_file).strip
 
     # unfortunately these messages only show if the install command is run
     # with the `--verbose` flag
@@ -93,7 +93,7 @@ while retries > 0
       $stderr.puts 'Download of the c-extension for the solarwinds_apm gem failed.'
       $stderr.puts 'solarwinds_apm will not instrument the code. No tracing will occur.'
       $stderr.puts 'Contact technicalsupport@solarwinds.com if the problem persists.'
-      $stderr.puts "error: #{ao_item}\n#{e.message}"
+      $stderr.puts "error: #{swo_item}\n#{e.message}"
       $stderr.puts '==================================================================='
       create_makefile('oboe_noop', 'noop')
     end
@@ -103,9 +103,9 @@ end
 
 if success
   # Create relative symlinks for the SolarWindsAPM library
-  Dir.chdir(ao_lib_dir) do
-    File.symlink(ao_clib, 'liboboe.so')
-    File.symlink(ao_clib, 'liboboe-1.0.so.0')
+  Dir.chdir(swo_lib_dir) do
+    File.symlink(swo_clib, 'liboboe.so')
+    File.symlink(swo_clib, 'liboboe-1.0.so.0')
   end
 
   dir_config('oboe', 'src', 'lib')

data/ext/oboe_metal/src/init_solarwinds_apm.cc

@@ -9,14 +9,8 @@ extern "C" {
 
 void Init_oboe_metal(void);
 
-void Init_profiling(void);
-
 void Init_libsolarwinds_apm() {
     Init_oboe_metal();
-
-    // * create SolarWindsAPM::CProfiler module for enabling SolarWindsAPM::Profiling
-    // * see lib/solarwinds_apm/support.rb
-    // Init_profiling(); 
 }
 
 #ifdef __cplusplus

data/lib/oboe_metal.rb

@@ -97,7 +97,7 @@ module SolarWindsAPM
       end
 
       private
-      
+
       # Internal: Report that instrumentation for the given layer has been
       # installed, as well as the version of instrumentation and version of
       # layer.
@@ -105,7 +105,7 @@ module SolarWindsAPM
       def report_init(layer=:rack) # :nodoc:
         # Don't send __Init in test or if SolarWindsAPM
         # isn't fully loaded (e.g. missing c-extension)
-        return if ENV.has_key?('SW_APM_GEM_TEST') || !SolarWindsAPM.loaded
+        return unless SolarWindsAPM.loaded
 
         platform_info = build_swo_init_report
         log_init(layer, platform_info)
@@ -148,7 +148,7 @@ module SolarWindsAPM
         begin
           platform_info['APM.Version']             = SolarWindsAPM::Version::STRING
           platform_info['APM.Extension.Version']   = extension_lib_version
-          
+
           # OTel Resource Attributes (Optional)
           platform_info['process.executable.path'] = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
           platform_info['process.executable.name'] = RbConfig::CONFIG['ruby_install_name']

data/lib/rails/generators/solarwinds_apm/install_generator.rb

@@ -10,9 +10,6 @@ module SolarWindsAPM
     @namespace = "solarwinds_apm:install"
 
     def copy_initializer
-      # Set defaults
-      @verbose = 'false'
-
       print_header
       print_footer
 

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

@@ -69,15 +69,6 @@ if defined?(SolarWindsAPM::Config)
   # The Ruby logger can afterwards be changed to a different level, e.g:
   # SolarWindsAPM.logger.level = Logger::INFO
 
-  #
-  # Set SW_APM_GEM_VERBOSE
-  # This setting will be overridden if SW_APM_GEM_VERBOSE is set as an environment variable
-  #
-  # On startup the components that are being instrumented will be reported if this is set to true.
-  # If true and the log level is 4 or higher this may create extra debug log messages
-  #
-  SolarWindsAPM::Config[:verbose] = false
-
   #
   # Turn Tracing on or off
   #
@@ -115,7 +106,7 @@ if defined?(SolarWindsAPM::Config)
   # disable/enable metrics and traces for certain transactions.
   #
   # Currently allowed array of hash
-  # 
+  #
   # and the hashes within the :url list either:
   #   :extensions  takes an array of strings for filtering (not regular expressions!)
   #   :tracing     defaults to :disabled, can be set to :enabled to override
@@ -156,8 +147,8 @@ if defined?(SolarWindsAPM::Config)
 
   #
   # Trigger Trace Mode
-  # 
-  # Trace options is a custom HTTP header X-Trace-Options that can be set on a request to carry additional information 
+  #
+  # Trace options is a custom HTTP header X-Trace-Options that can be set on a request to carry additional information
   # to the agents, one such option being trigger-trace which we’ll call a trigger trace request.
   #
   SolarWindsAPM::Config[:trigger_tracing_mode] = 'enabled'
@@ -178,12 +169,12 @@ if defined?(SolarWindsAPM::Config)
   # Appending trace contenxt (i.e. traceparent) as an sql comment
   # at the beginning or end of sql. This modified sql will be
   # sent to sql server for trace correlation.
-  # 
+  #
   # Example:
   #   SELECT `posts`.* FROM `posts` /*traceparent=00-a448f096d441e167d12ebd32a927c1a5-a29655a47e430119-01*/
-  # 
-  # This option can add a small overhead for prepared statements since the traceparent value is unique per execution. 
-  # This feature uses marginalia, see its caveat and possible workaround 
+  #
+  # This option can add a small overhead for prepared statements since the traceparent value is unique per execution.
+  # This feature uses marginalia, see its caveat and possible workaround
   # https://github.com/basecamp/marginalia/blob/master/README.md#prepared-statements
   #
   SolarWindsAPM::Config[:tag_sql] = false

data/lib/solarwinds_apm/api/current_trace_info.rb

@@ -49,7 +49,7 @@ module SolarWindsAPM
       class TraceInfo
         attr_reader :tracestring, :trace_id, :span_id, :trace_flags, :do_log
 
-        REGEXP = /^(?<tracestring>(?<version>[a-f0-9]{2})-(?<trace_id>[a-f0-9]{32})-(?<span_id>[a-f0-9]{16})-(?<flags>[a-f0-9]{2}))$/.freeze
+        REGEXP = /^(?<tracestring>(?<version>[a-f0-9]{2})-(?<trace_id>[a-f0-9]{32})-(?<span_id>[a-f0-9]{16})-(?<flags>[a-f0-9]{2}))$/
         private_constant :REGEXP
 
         def initialize

data/lib/solarwinds_apm/api/transaction_name.rb

@@ -32,10 +32,11 @@ module SolarWindsAPM
       def set_transaction_name(custom_name=nil)
         
         return false if custom_name.nil? || custom_name.empty? 
+        return true  if SolarWindsAPM::Context.toString == '00-00000000000000000000000000000000-0000000000000000-00' # noop
 
         solarwinds_processor = SolarWindsAPM::OTelConfig.class_variable_get(:@@config)[:span_processor]
         if solarwinds_processor.nil?
-          SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Solarwinds processor is missing. Set transaction name failed."}
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Solarwinds processor is missing. Set transaction name failed."}
           return false
         end
 
@@ -43,13 +44,13 @@ module SolarWindsAPM
         entry_span_id  = ::OpenTelemetry::Baggage.value(::SolarWindsAPM::Constants::INTL_SWO_CURRENT_SPAN_ID)
 
         if entry_trace_id.nil? || entry_span_id.nil? 
-          SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Cannot cache custom transaction name #{custom_name} because OTel service entry span not started; ignoring"}
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Cannot cache custom transaction name #{custom_name} because OTel service entry span not started; ignoring"}
           return false
         end
 
         trace_span_id = "#{entry_trace_id}-#{entry_span_id}"
         solarwinds_processor.txn_manager.set(trace_span_id,custom_name) 
-        SolarWindsAPM.logger.debug {"[#{self.name}/#{__method__}] Cached custom transaction name for #{trace_span_id} as #{custom_name}"}
+        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Cached custom transaction name for #{trace_span_id} as #{custom_name}"}
         true
       end
     end

data/lib/solarwinds_apm/config.rb

@@ -11,13 +11,13 @@ module SolarWindsAPM
   module Config
     @@config = {}
     @@instrumentation = [:action_controller, :action_controller_api, :action_view,
-                        :active_record, :bunnyclient, :bunnyconsumer, :curb,
-                        :dalli, :delayed_jobclient, :delayed_jobworker,
-                        :excon, :faraday, :graphql, :grpc_client, :grpc_server, :grape,
-                        :httpclient, :nethttp, :memcached, :mongo, :moped, :padrino, :rack, :redis,
-                        :resqueclient, :resqueworker, :rest_client,
-                        :sequel, :sidekiqclient, :sidekiqworker, :sinatra, :typhoeus,
-                        :curb, :excon, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
+                         :active_record, :bunnyclient, :bunnyconsumer, :curb,
+                         :dalli, :delayed_jobclient, :delayed_jobworker,
+                         :excon, :faraday, :graphql, :grpc_client, :grpc_server, :grape,
+                         :httpclient, :nethttp, :memcached, :mongo, :moped, :padrino, :rack, :redis,
+                         :resqueclient, :resqueworker, :rest_client,
+                         :sequel, :sidekiqclient, :sidekiqworker, :sinatra, :typhoeus,
+                         :curb, :excon, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
 
     ##
     # load_config_file
@@ -47,28 +47,21 @@ module SolarWindsAPM
       config_file = File.join(Dir.pwd, 'solarwinds_apm_config.rb')
       config_files << config_file if File.exist?(config_file)
 
-      SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Multiple configuration files configured, using the first one listed: #{config_files.join(', ')}"} if config_files.size > 1
+      SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Multiple configuration files configured, using the first one listed: #{config_files.join(', ')}"} if config_files.size > 1
       load(config_files[0]) if config_files.size > 0
 
       set_log_level        # sets SolarWindsAPM::Config[:debug_level], SolarWindsAPM.logger.level
-      set_verbose_level    # the verbose setting is only relevant for ruby, ENV['SW_APM_GEM_VERBOSE'] overrides
     end
 
     def self.config_from_env
-      config_files = []
       if File.exist?(ENV['SW_APM_CONFIG_RUBY']) && !File.directory?(ENV['SW_APM_CONFIG_RUBY'])
-        config_files << ENV['SW_APM_CONFIG_RUBY']
+        config_file = ENV['SW_APM_CONFIG_RUBY']
       elsif File.exist?(File.join(ENV['SW_APM_CONFIG_RUBY'], 'solarwinds_apm_config.rb'))
-        config_files << File.join(ENV['SW_APM_CONFIG_RUBY'], 'solarwinds_apm_config.rb')
+        config_file = File.join(ENV['SW_APM_CONFIG_RUBY'], 'solarwinds_apm_config.rb')
       else
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Could not find the configuration file set by the SW_APM_CONFIG_RUBY environment variable:  #{ENV['SW_APM_CONFIG_RUBY']}"}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Could not find the configuration file set by the SW_APM_CONFIG_RUBY environment variable:  #{ENV['SW_APM_CONFIG_RUBY']}"}
       end
-      config_files
-    end
-
-    def self.set_verbose_level
-      verbose = ENV.has_key?('SW_APM_GEM_VERBOSE')? ENV['SW_APM_GEM_VERBOSE'].downcase == 'true' : nil
-      SolarWindsAPM::Config[:verbose] = verbose
+      config_file
     end
 
     def self.set_log_level
@@ -86,9 +79,9 @@ module SolarWindsAPM
     # to create an output similar to the content of the config file
     #
     def self.print_config
-      SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] General configurations list blow:"}
+      SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] General configurations list blow:"}
       @@config.each do |k,v|
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Config Key/Value: #{k}, #{v.inspect}"}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Config Key/Value: #{k}, #{v.inspect}"}
       end
     end
 
@@ -99,9 +92,6 @@ module SolarWindsAPM
     # The defaults are read from the template configuration file.
     #
     def self.initialize(_data={})
-      @@config[:profiling] = :disabled
-      @@config[:profiling_interval] = 5
-
       # for config file backward compatibility
       @@instrumentation.each {|inst| @@config[inst] = {}}
       @@config[:transaction_name] = {}
@@ -137,40 +127,24 @@ module SolarWindsAPM
 
       case key
       when :sampling_rate
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] sampling_rate is not a supported setting for SolarWindsAPM::Config. Please use :sample_rate."}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] sampling_rate is not a supported setting for SolarWindsAPM::Config. Please use :sample_rate."}
 
       when :sample_rate
         unless value.is_a?(Integer) || value.is_a?(Float)
-          SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] :sample_rate must be a number between 0 and 1000000 (1m) (provided: #{value}), corrected to 0"}
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] :sample_rate must be a number between 0 and 1000000 (1m) (provided: #{value}), corrected to 0"}
           value = 0
         end
 
         # Validate :sample_rate value
         unless value.between?(0, 1e6)
           new_value = value < 0 ? 0 : 1_000_000
-          SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] :sample_rate must be between 0 and 1000000 (1m) (provided: #{value}), corrected to #{new_value}"}
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] :sample_rate must be between 0 and 1000000 (1m) (provided: #{value}), corrected to #{new_value}"}
         end
 
         # Assure value is an integer
         @@config[key.to_sym] = new_value.to_i
         SolarWindsAPM.sample_rate(new_value) if SolarWindsAPM.loaded
 
-      when :profiling
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Profiling feature is currently not available." }
-        @@config[:profiling] = :disabled
-
-      when  :profiling_interval
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Profiling feature is currently not available. :profiling_interval setting is not configured."}
-        value = if value.is_a?(Integer) && value > 0
-                  [100, value].min
-                else
-                  10
-                end
-        @@config[:profiling_interval] = value
-        # CProfiler may not be loaded yet, the profiler will send the value
-        # after it is loaded
-        SolarWindsAPM::CProfiler.interval_setup(value) if defined? SolarWindsAPM::CProfiler
-
       when :transaction_settings
         compile_settings(value)
 
@@ -230,7 +204,7 @@ module SolarWindsAPM
         begin
           v[:regexp].is_a?(String) ? Regexp.new(v[:regexp], v[:opts]) : Regexp.new(v[:regexp])
         rescue StandardError => e
-          SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Problem compiling transaction_settings item #{v}, will ignore. Error: #{e.message}"}
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Problem compiling transaction_settings item #{v}, will ignore. Error: #{e.message}"}
           nil
         end
       end

data/lib/solarwinds_apm/oboe_init_options.rb

@@ -1,6 +1,7 @@
 # Copyright (c) 2019 SolarWinds, LLC.
 # All rights reserved.
 require 'singleton'
+require 'uri'
 module SolarWindsAPM
   # OboeInitOptions
   class OboeInitOptions
@@ -96,9 +97,6 @@ module SolarWindsAPM
     def reporter_and_host
 
       reporter = ENV['SW_APM_REPORTER'] || 'ssl'
-      # override with 'file', e.g. when running tests
-      # changed my mind => set the right reporter in the env when running tests !!!
-      # reporter = 'file' if ENV.key?('SW_APM_GEM_TEST')
 
       host = ''
       case reporter
@@ -123,7 +121,7 @@ module SolarWindsAPM
       return '' unless @reporter == 'ssl'
 
       service_key = ENV['SW_APM_SERVICE_KEY'] || SolarWindsAPM::Config[:service_key]
-      unless service_key
+      if service_key.nil? || service_key == ''
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY not configured."}
         return ''
       end
@@ -133,7 +131,7 @@ module SolarWindsAPM
       service_name = match[3]
 
       return '' unless validate_token(token)   # return if token is not even valid
-      
+
       if service_name.empty?
         ENV.delete('OTEL_SERVICE_NAME')
         SolarWindsAPM.logger.warn {"[#{self.class}/#{__method__}] SW_APM_SERVICE_KEY format problem. Service Name is missing."}
@@ -197,7 +195,7 @@ module SolarWindsAPM
     def read_and_validate_ec2_md_timeout
       timeout = ENV['SW_APM_EC2_METADATA_TIMEOUT'] || SolarWindsAPM::Config[:ec2_metadata_timeout]
       return 1000 unless timeout.is_a?(Integer) || timeout =~ /^\d+$/
-      
+
       timeout = timeout.to_i
       timeout.between?(0, 3000) ? timeout : 1000
     end
@@ -218,16 +216,16 @@ module SolarWindsAPM
       file = String.new
       file = "#{__dir__}/cert/star.appoptics.com.issuer.crt" if appoptics_collector?
       file = ENV['SW_APM_TRUSTEDPATH'] if !ENV['SW_APM_TRUSTEDPATH'].nil? && !ENV['SW_APM_TRUSTEDPATH']&.empty?
-      
+
       return file if file.empty?
-      
+
       begin
         certificate = File.open(file,"r").read
       rescue StandardError => e
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] certificates: #{file} doesn't exist or caused by #{e.message}."}
         certificate = String.new
       end
-      
+
       certificate
     end
 
@@ -236,7 +234,7 @@ module SolarWindsAPM
     end
 
     def appoptics_collector?
-      allowed_uri = ['collector.appoptics.com', 'collector-stg.appoptics.com', 
+      allowed_uri = ['collector.appoptics.com', 'collector-stg.appoptics.com',
                      'collector.appoptics.com:443', 'collector-stg.appoptics.com:443']
 
       (allowed_uri.include? ENV["SW_APM_COLLECTOR"])? true : false
@@ -246,12 +244,12 @@ module SolarWindsAPM
       return uri if uri.nil? || uri.empty?
 
       begin
-        sanitized_uri = URI("http://#{uri}").host
+        sanitized_uri = ::URI.parse("http://#{uri}").host
         return sanitized_uri unless sanitized_uri.nil?
       rescue StandardError => e
         SolarWindsAPM.logger.error {"[#{self.class}/#{__method__}] uri for collector #{uri} is malformat. Error: #{e.message}"}
       end
-      ""    
+      ""
     end
   end
 end

data/lib/solarwinds_apm/opentelemetry/solarwinds_processor.rb

@@ -64,25 +64,28 @@ module SolarWindsAPM
           status_code = get_http_status_code(span)
           request_method = span.attributes[HTTP_METHOD]
 
-          SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] createHttpSpan with\n
+          SolarWindsAPM.logger.debug do 
+            "[#{self.class}/#{__method__}] createHttpSpan with\n
                                           trans_name: #{trans_name}\n
                                           url_tran: #{url_tran}\n
                                           domain: #{domain}\n
                                           span_time: #{span_time}\n
                                           status_code: #{status_code}\n
                                           request_method: #{request_method}\n
-                                          has_error: #{has_error}"}
+                                          has_error: #{has_error}"
+          end
 
-          liboboe_txn_name = SolarWindsAPM::Span.createHttpSpan(trans_name,url_tran,domain,span_time,status_code,
-                                                                    request_method,has_error)
+          liboboe_txn_name = SolarWindsAPM::Span.createHttpSpan(trans_name,url_tran,domain,span_time,status_code,request_method,has_error)
   
         else
           
-          SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] createSpan with \n
+          SolarWindsAPM.logger.debug do 
+            "[#{self.class}/#{__method__}] createSpan with \n
                                           trans_name: #{trans_name}\n
                                           domain: #{domain}\n
                                           span_time: #{span_time}\n
-                                          has_error: #{has_error}"}
+                                          has_error: #{has_error}"
+          end
 
           liboboe_txn_name = SolarWindsAPM::Span.createSpan(trans_name, domain, span_time, has_error)
         end

data/lib/solarwinds_apm/opentelemetry/solarwinds_sampler.rb

@@ -37,14 +37,16 @@ module SolarWindsAPM
       # parent_context: OpenTelemetry::Context
       def should_sample?(trace_id:, parent_context:, links:, name:, kind:, attributes:)
 
-        SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] should_sample? parameters \n
+        SolarWindsAPM.logger.debug do 
+          "[#{self.class}/#{__method__}] should_sample? parameters \n
                                         trace_id: #{trace_id.unpack1('H*')}\n
                                         parent_context:  #{parent_context}\n
                                         parent_context.inspect:  #{parent_context.inspect}\n
                                         links: #{links}\n
                                         name: #{name}\n
                                         kind: #{kind}\n
-                                        attributes: #{attributes}"}
+                                        attributes: #{attributes}"
+        end
 
         # if the upstream has tracestate: sw=.... then it should capture it 
 
@@ -89,14 +91,15 @@ module SolarWindsAPM
 
         SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] name: #{name}, kind: #{kind}, attributes: #{attributes.inspect}"}
 
-        url = attributes.nil?? '' : attributes['http.host'] || attributes['http.url'] || attributes['net.peer.name']  # otel-ruby contrib use different key to store url info
-        transaction_naming_key = "#{url}-#{name}-#{kind}"
+        # otel-ruby contrib use different key to store url info, currently it's using http.target for path
+        url_path = attributes.nil?? '' : attributes['http.target']
+        transaction_naming_key = "#{url_path}-#{name}-#{kind}"
         
         tracing_mode           = SolarWindsAPM::TransactionCache.get(transaction_naming_key)
         
         if tracing_mode.nil?
           SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] transaction cache NOT found: #{transaction_naming_key}."}
-          trans_settings = SolarWindsAPM::TransactionSettings.new(url: url, name: name, kind: kind)          
+          trans_settings = SolarWindsAPM::TransactionSettings.new(url_path: url_path, name: name, kind: kind)          
           tracing_mode   = trans_settings.calculate_trace_mode == 1 ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
           SolarWindsAPM::TransactionCache.set(transaction_naming_key, tracing_mode)
         else
@@ -120,7 +123,8 @@ module SolarWindsAPM
           timestamp = xtraceoptions.timestamp
         end
 
-        SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] decision parameters \n
+        SolarWindsAPM.logger.debug do 
+          "[#{self.class}/#{__method__}] decision parameters \n
                                          tracestring: #{tracestring}\n
                                          sw_member_value: #{sw_member_value}\n
                                          tracing_mode:    #{tracing_mode}\n
@@ -129,7 +133,8 @@ module SolarWindsAPM
                                          trigger_trace_mode:    #{trigger_trace_mode}\n
                                          options:      #{options}\n
                                          signature:    #{signature}\n
-                                         timestamp:    #{timestamp}"}
+                                         timestamp:    #{timestamp}"
+        end
 
         args = [tracestring,sw_member_value,tracing_mode,sample_rate,trigger_trace,trigger_trace_mode,options,signature,timestamp] 
         do_metrics, do_sample, rate, source, bucket_rate, \

data/lib/solarwinds_apm/otel_config.rb

@@ -13,7 +13,7 @@ module SolarWindsAPM
       return unless @@agent_enabled  # only show the msg once
       
       @@agent_enabled = false
-      SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Agent disabled. No Trace exported."}
+      SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Agent disabled. No Trace exported."}
     end
 
     def self.validate_service_key
@@ -61,10 +61,10 @@ module SolarWindsAPM
 
     def self.print_config
       @@config.each do |config, value|
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] config:     #{config} = #{value}"}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] config:     #{config} = #{value}"}
       end
       @@config_map.each do |config, value|
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] config_map: #{config} = #{value}"}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] config_map: #{config} = #{value}"}
       end
     end
 
@@ -84,16 +84,16 @@ module SolarWindsAPM
         return
       end
 
-      SolarWindsAPM.logger.debug {"[#{self.name}/#{__method__}] propagators: #{propagators.map(&:class)}"}
+      SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] propagators: #{propagators.map(&:class)}"}
       unless ([::OpenTelemetry::Trace::Propagation::TraceContext::TextMapPropagator, ::OpenTelemetry::Baggage::Propagation::TextMapPropagator] - propagators.map(&:class)).empty? # rubocop:disable Style/GuardClause
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Missing tracecontext propagator."}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Missing tracecontext propagator."}
         disable_agent
       end
     end
 
     def self.initialize
       unless defined?(::OpenTelemetry::SDK::Configurator)
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] missing OpenTelemetry::SDK::Configurator; opentelemetry seems not loaded."}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] missing OpenTelemetry::SDK::Configurator; opentelemetry seems not loaded."}
         disable_agent
         return
       end
@@ -144,14 +144,14 @@ module SolarWindsAPM
     #
     def self.initialize_with_config
       unless block_given?
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] Block not given while doing in-code configuration. Agent disabled."}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Block not given while doing in-code configuration. Agent disabled."}
         return
       end
 
       yield @@config_map
 
       if @@config_map.empty?
-        SolarWindsAPM.logger.warn {"[#{self.name}/#{__method__}] No configuration given for in-code configuration. Agent disabled."}
+        SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] No configuration given for in-code configuration. Agent disabled."}
         return
       end
 

data/lib/solarwinds_apm/support/swomarginalia/comment.rb

@@ -107,7 +107,7 @@ module SolarWindsAPM
         marginalia_job["class"] if marginalia_job.respond_to?(:[])
       end
 
-      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}.freeze
+      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}
 
       def self.line
         SWOMarginalia::Comment.lines_to_ignore ||= DEFAULT_LINES_TO_IGNORE_REGEX
@@ -179,7 +179,7 @@ module SolarWindsAPM
           span_id: span_context.hex_span_id,
           trace_flags: trace_flag)
       rescue NameError => e
-        SolarWindsAPM.logger.error {"[#{self.name}/#{__method__}] Couldn't find OpenTelemetry. Error: #{e.message}"}
+        SolarWindsAPM.logger.error {"[#{name}/#{__method__}] Couldn't find OpenTelemetry. Error: #{e.message}"}
       end
 
       if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')

data/lib/solarwinds_apm/support/swomarginalia/swomarginalia.rb

@@ -53,7 +53,7 @@ module SolarWindsAPM
       # We don't want to trace framework caches.
       # Only instrument SQL that directly hits the database.
       def ignore_payload?(name)
-        %w(SCHEMA EXPLAIN CACHE).include?(name.to_s)
+        %w[SCHEMA EXPLAIN CACHE].include?(name.to_s)
       end
     end
 

data/lib/solarwinds_apm/support/transaction_settings.rb

@@ -9,14 +9,14 @@ module SolarWindsAPM
     SWO_TRACING_ENABLED      = 1
     SWO_TRACING_DISABLED     = 0
 
-    def initialize(url: '', name: '', kind: '')
-      @url = url
-      @name = name
-      @kind = kind
+    def initialize(url_path: '', name: '', kind: '')
+      @url_path = url_path
+      @name     = name
+      @kind     = kind
     end
 
-    # calculate trace mode to set either 1 or 0 based on url and name+kind
-    # first check if url match, if not match, then match the name+kind
+    # calculate trace mode to set either 1 or 0 based on url_path and name+kind
+    # first check if url_path match, if not match, then match the name+kind
     def calculate_trace_mode
       tracing_mode_enabled? && tracing_enabled? ? SWO_TRACING_ENABLED : SWO_TRACING_DISABLED
     end
@@ -36,8 +36,8 @@ module SolarWindsAPM
       SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] enabled_regexps: #{enabled_regexps&.inspect}"}
       SolarWindsAPM.logger.debug {"[#{self.class}/#{__method__}] disabled_regexps: #{disabled_regexps&.inspect}"}
 
-      return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(@url) }
-      return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(@url) }
+      return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(@url_path) }
+      return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(@url_path) }
       return false if disabled_regexps.is_a?(Array) && disabled_regexps.any? { |regex| regex.match?(span_layer) }
       return true if enabled_regexps.is_a?(Array) && enabled_regexps.any? { |regex| regex.match?(span_layer) }
 

data/lib/solarwinds_apm/support.rb

@@ -27,10 +27,14 @@ if SolarWindsAPM::Config[:tag_sql]
       #     } 
       #   }
       # ]
+      SolarWindsAPM.logger.info {"In Rails 7, tag tracecontext on a query by including SolarWindsAPM::SWOMarginalia::Comment.traceparent as function in config.active_record.query_log_tags."}
+      SolarWindsAPM.logger.info {"For more information, please check https://api.rubyonrails.org/classes/ActiveRecord/QueryLogs.html"}
       require_relative './support/swomarginalia/comment'
     end
-  else
+  elsif defined?(::ActiveRecord) && ::ActiveRecord.version.to_s < '7'
     require_relative './support/swomarginalia/load_swomarginalia'
     SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert
+  else
+    SolarWindsAPM.logger.info {"tag_sql currently is not supported in non-rails app that use active_record > 7"}
   end
 end

data/lib/solarwinds_apm/version.rb

@@ -9,7 +9,7 @@ module SolarWindsAPM
     MAJOR  = 6 # breaking,
     MINOR  = 0 # feature,
     PATCH  = 0 # fix => BFF
-    PRE    = 'preV1' # for pre-releases into packagecloud, set to nil for production releases into rubygems
+    PRE    = 'preV2'.freeze # 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

@@ -1,8 +1,7 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-begin  
-
+begin
   if ENV.has_key?('SOLARWINDS_APM_ENABLED') && (ENV['SOLARWINDS_APM_ENABLED'] == 'false' || ENV['SOLARWINDS_APM_ENABLED'] == false)
     SolarWindsAPM.logger.warn 'SOLARWINDS_APM_ENABLED environment variable detected and was set to false; SolarWindsAPM disabled'
     return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 6.0.0.preV1
+  version: 6.0.0.preV2
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
@@ -41,20 +41,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.31.0
-- !ruby/object:Gem::Dependency
-  name: ruby2_keywords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +109,6 @@ files:
 - lib/solarwinds_apm/noop/README.md
 - lib/solarwinds_apm/noop/context.rb
 - lib/solarwinds_apm/noop/metadata.rb
-- lib/solarwinds_apm/noop/profiling.rb
 - lib/solarwinds_apm/oboe_init_options.rb
 - lib/solarwinds_apm/opentelemetry.rb
 - lib/solarwinds_apm/opentelemetry/solarwinds_exporter.rb
@@ -174,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: SolarWindsAPM performance instrumentation gem for Ruby

data/lib/solarwinds_apm/noop/profiling.rb

@@ -1,17 +0,0 @@
-module SolarWindsAPM
-  # override the Ruby method, so that no code related to profiling gets executed
-  class Profiling
-    def self.run
-      yield
-    end
-  end
-
-  # these put the c-functions into "noop"
-  module CProfiler
-    def self.interval_setup(_); end
-
-    def self.tid
-      0
-    end
-  end
-end