solarwinds_apm 6.0.0.preV1 → 6.0.0.preV3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b2c4b54eaff62c93db5c06ebd9e85f73aea61943fa8eb90f0ba157dc81ab01
-  data.tar.gz: 2133540e0d8ec4ab097cd638d0cfd834649bc4898555ffb9cbfd7fa58a6e2355
+  metadata.gz: 6ac8eac87b0a75af0fc92b5f220fd70393a893b1b3291b013d11e5dfa29ee99e
+  data.tar.gz: 2fc862e44f562b7d29c85cd7b54fcb490c4ba5c8575f817a4d65d6cf9914479b
 SHA512:
-  metadata.gz: 2731e533815670079641e91865a502157162a4924d4c1c0950b50f3e42d7417619305f51a2db22f12ef45ea9111b826d59bcd091f9201b1375afdb06e940421a
-  data.tar.gz: 6c2053e792310de17c09a58b68e8b74ba100a01c025d703d8cee315b7c3ad7ae6f23da08fe0b5dda2a6328a710330c6ce1468db12703c4d16ce98f1564df5436
+  metadata.gz: 3f08999c45b7fe14c224df1af5bd4fc83ba9efd21fb4d6bac5ec36bfe437448ce0622ce8997e9acf47c90010fda716a1f92f35b7336b41fb29ac33ded939abfa
+  data.tar.gz: 2e9dc14242b180518bf23d39db3c8f93dde26855fc5a9ee356a7d712ac624e0939adf5390f02770a1bd56d38fa34d9cb91566d7747e073982514e9ae6e09b380

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/lib/liboboe-1.0-aarch64.so.sha256

@@ -1 +1 @@
-b931c715d8ddaa9f2b91c72ad708ed3467e6e68ee4255756123b2ca96f1b98d0
+86a0c98301b157fd2ec184e585d70e40753c721c52fbc596ab09aa3d422d5f1f

data/ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.sha256

@@ -1 +1 @@
-c8189fe6f5b31c15c31d3b005aebcff90f97ff82e92d9e0d3b254bbbe2a7367d
+534122daed4a1a81a9e66828f206662ea8f6bf891fb84438cc3daef5f78a7af4

data/ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.sha256

@@ -1 +1 @@
-2824ba630ba794ff6280358922b54e8e1be4ccdb145376f90601e6652d149525
+89936e04f0b8cddf3fb94c8a4c21d16aa780d6e4fbf4bb66eba42eb33fe15cc6

data/ext/oboe_metal/lib/liboboe-1.0-x86_64.so.sha256

@@ -1 +1 @@
-82a003ec82e3703260cdc215ef4c0c0bc7bc916cef27ef509034b60fd5ef9b35
+623f5b308759754c8d771567d5346c46e1d9b53739995a9b5594cc08f8bc6e54

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1 @@
-12.4.0
-
+13.0.0

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/ext/oboe_metal/src/oboe.h

@@ -432,16 +432,6 @@ int oboe_init_reporter(const char *protocol, oboe_init_options_t *options);
  */
 int oboe_init_options_set_defaults(oboe_init_options_t *options);
 
-/**
- * Disconnect or shut down the Oboe reporter, but allow it to be reconnect()ed.
- */
-void oboe_reporter_disconnect();    /* TODO: Need implementation. */
-
-/**
- * Reconnect or restart the Oboe reporter.
- */
-void oboe_reporter_reconnect();     /* TODO: Need implementation. */
-
 /**
  * tell reporter to flush all messages that are currently buffered
  */
@@ -712,8 +702,6 @@ void oboe_settings_rate_set(int sample_rate);
 void oboe_settings_mode_set(int tracing_mode);
 void oboe_settings_trigger_set(int trigger_mode);
 
-int oboe_rand_get_value();
-
 /**
  * Convert a tracing mode to a printable string.
  */

data/ext/oboe_metal/src/oboe_swig_wrap.cc

@@ -1932,7 +1932,7 @@ SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
 } 
 
 
-/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2120,7 +2120,7 @@ SWIG_From_std_string  (const std::string& s)
   #define SWIG_From_double   rb_float_new 
 
 
-/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2172,7 +2172,7 @@ SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
 
 
 #ifdef SWIG_LONG_LONG_AVAILABLE
-/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2203,7 +2203,7 @@ SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
 #endif
 
 
-/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2234,7 +2234,7 @@ SWIG_AsVal_double (VALUE obj, double *val)
 
 
 #ifdef SWIG_LONG_LONG_AVAILABLE
-/*@SWIG:/usr/local/share/swig/4.0.2/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;

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,12 +106,8 @@ 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
-  #              the global :disabled setting
-  # or:
+  #
+  # and the hashes within the :transaction_settings list:
   #   :regexp      is a regular expression that is applied to the incoming path
   #   :opts        (optional) nil(default) or Regexp::IGNORECASE (options for regexp)
   #   :tracing     defaults to :disabled, can be set to :enabled to override
@@ -130,10 +117,6 @@ if defined?(SolarWindsAPM::Config)
   # down execution.
   #
   SolarWindsAPM::Config[:transaction_settings] = [
-    #   {
-    #     extensions: %w[long_job],
-    #     tracing: :disabled
-    #   },
     #   {
     #     regexp: '^.*\/long_job\/.*$',
     #     opts: Regexp::IGNORECASE,
@@ -156,8 +139,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 +161,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
@@ -108,7 +108,6 @@ module SolarWindsAPM
           span_id  = span.context.hex_span_id
           trace_flags = span.context.trace_flags.sampled?? '01' : '00'
           tracestring = "00-#{trace_id}-#{span_id}-#{trace_flags}"
-          
           [trace_id, span_id, trace_flags, tracestring]
         end
 

data/lib/solarwinds_apm/api/opentelemetry.rb

@@ -0,0 +1,39 @@
+module SolarWindsAPM
+  module API
+    module OpenTelemetry
+      # Create custom span based on current last span
+      #
+      # Wrap OpenTelemetry function OpenTelemetry.tracer_provider.tracer.in_span
+      #
+      # === Argument:
+      #
+      # * +name+ - (int, default 3000) the maximum time to wait in milliseconds
+      # * +attributes+ - (hash, default nil)
+      # * +links+ - (string, default nil)
+      # * +start_timestamp+ - (int, default nil)
+      # * +kind+ - (symbol, default nil)
+      #
+      # === Example:
+      #
+      #   SolarWindsAPM::API.in_span('custom_span') do |span|
+      #     url = URI.parse("http://www.google.ca/")
+      #     req = Net::HTTP::Get.new(url.to_s)
+      #     res = Net::HTTP.start(url.host, url.port) {|http| http.request(req)}
+      #   end
+      # 
+      # === Returns:
+      # * Objective
+      #
+      def in_span(name, attributes: nil, links: nil, start_timestamp: nil, kind: nil, &block)
+        if block.nil?
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] please provide block when using in_span function"}
+          return
+        end
+
+        SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] solarwinds_apm in_span with OTEL_SERVICE_NAME #{ENV['OTEL_SERVICE_NAME']}"}
+        current_tracer = ::OpenTelemetry.tracer_provider.tracer(ENV['OTEL_SERVICE_NAME'])
+        current_tracer.in_span(name, attributes: attributes, links: links, start_timestamp: start_timestamp, kind: kind, &block)
+      end
+    end
+  end
+end

data/lib/solarwinds_apm/api/transaction_name.rb

@@ -31,26 +31,27 @@ module SolarWindsAPM
       #
       def set_transaction_name(custom_name=nil)
         
-        return false if custom_name.nil? || custom_name.empty? 
+        status = true
+        if custom_name.nil? || custom_name.empty? 
+          status = false
+        elsif SolarWindsAPM::Context.toString == '99-00000000000000000000000000000000-0000000000000000-00' # noop
+          status = true
+        elsif SolarWindsAPM::OTelConfig.class_variable_get(:@@config)[:span_processor].nil?
+          SolarWindsAPM.logger.warn {"[#{name}/#{__method__}] Solarwinds processor is missing. Set transaction name failed."}
+          status = false
+        else
+          solarwinds_processor       = SolarWindsAPM::OTelConfig.class_variable_get(:@@config)[:span_processor]
+          current_span               = ::OpenTelemetry::Trace.current_span
+          entry_trace_id             = current_span.context.hex_trace_id
+          entry_span_id, trace_flags = solarwinds_processor.txn_manager.get_root_context_h(entry_trace_id)&.split('-')
 
-        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."}
-          return false
-        end
-
-        entry_trace_id = ::OpenTelemetry::Baggage.value(::SolarWindsAPM::Constants::INTL_SWO_CURRENT_TRACE_ID)
-        entry_span_id  = ::OpenTelemetry::Baggage.value(::SolarWindsAPM::Constants::INTL_SWO_CURRENT_SPAN_ID)
+          status = false if entry_trace_id.nil? || entry_span_id.nil? || trace_flags.nil?
+          status = false if entry_trace_id == '0'*32 || entry_span_id == '0'*16 || trace_flags == '00' # not sampled
 
-        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"}
-          return false
+          solarwinds_processor.txn_manager.set("#{entry_trace_id}-#{entry_span_id}",custom_name) 
+          SolarWindsAPM.logger.debug {"[#{name}/#{__method__}] Cached custom transaction name for #{entry_trace_id}-#{entry_span_id} as #{custom_name}"}
         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}"}
-        true
+        status
       end
     end
   end

data/lib/solarwinds_apm/api.rb

@@ -4,11 +4,13 @@
 require_relative './api/transaction_name'
 require_relative './api/current_trace_info'
 require_relative './api/tracing'
+require_relative './api/opentelemetry'
 
 module SolarWindsAPM
   module API
     extend SolarWindsAPM::API::TransactionName
     extend SolarWindsAPM::API::CurrentTraceInfo
     extend SolarWindsAPM::API::Tracing
+    extend SolarWindsAPM::API::OpenTelemetry
   end
 end