solarwinds_apm 5.1.2 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62089a2d5a8a8728332f7e5b98c8d11c9f84523ec187b0420c84f9dc5951191
-  data.tar.gz: d5aedff305013aea008f886362907ffd6ed1f36f73d8a2dc9ee5d08968b80d9e
+  metadata.gz: 6b56699604e8448a606d69ed23ba957622c4b70d8d2cbcf070526105f2dcff87
+  data.tar.gz: 5b0f55643f2ea9072418c66c62a6f9ea4ca87fea74fbcec66574a341e0510c82
 SHA512:
-  metadata.gz: b9d8c4dc8e9847308f68d747b7262da560b0bff4d1653bf92856bc2599a2f600291daeaeb28f7e9c96ede12a408117b434b4bb8cefd9eeb0f6a7f5ec6838eb6b
-  data.tar.gz: 5a1f702b33e82fbc0464f7aed84411d55d5a1eaab38b47fc6f83dbf639673180698ec971e18b8cf9d3811a1b0441b09a53686103315b23c540df902fbcf67d76
+  metadata.gz: f77f2c0e8315832f92204bc0cdd29d6588f83cbf2751f8dfac2fb0402c65091c96238f0192da4473b99a0cf5197b44a66839f7d1c58fb5521bd11ce1a96defc6
+  data.tar.gz: 53c8e3740a5361fa4f9e403cf863f2044d821a58a7c42ac8708c859781c363b168af78e39da50b2ceeda783b752205cf0c0cb5bdf86afa7ffa4e63e80ae4dffe

data/.gitignore

@@ -41,3 +41,18 @@ gemfiles/vendor*
 lib/libsolarwinds_apm.so
 vendor/
 
+# test & test script
+tmp.rb
+apm.collector.st-ssp.solarwinds.com
+test/run_tests/.ruby_version_ubuntu
+test/run_tests/.ruby_version_alpine
+test/run_tests/.ruby_version_centos
+test/run_tests/.ruby_version_ubuntu
+
+redis-test.*
+
+# compiling
+ext/oboe_metal/verify
+
+# mac DS_Store
+.DS_Store

data/CHANGELOG.md

@@ -3,6 +3,20 @@ https://github.com/solarwindscloud/solarwinds-apm-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# solarwinds_apm 5.1.4 (11/23/2022)
+
+This release includes the following features:
+
+* Update to the latest redis-rb gem (> 5.x)
+* Update latest liboboe library (11.1.0)
+* Start to support solarwinds-apm-ruby arm64/aarch64 
+* Init message update for swo/nh backends
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.4
+
+
 # solarwinds_apm 5.1.0 (09/15/2022)
 
 This release includes the following features:

data/README.md

@@ -11,7 +11,8 @@ It requires an [Solarwinds] account to view metrics.  Get yours,
 
 [![Gem Version](https://badge.fury.io/rb/solarwinds_apm.svg)](https://badge.fury.io/rb/solarwinds_apm)
 
-[![Run all Tests](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_tests.yml/badge.svg)](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_tests.yml)
+[![Run all Tests](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml/badge.svg)](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/test_on_4_linux.yml)
+
 [![C++ Tests](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_cpluplus_tests.yml/badge.svg)](https://github.com/appoptics/appoptics-apm-ruby/actions/workflows/run_cpluplus_tests.yml)
 
 [comment]: <> ([![Maintainability]&#40;https://api.codeclimate.com/v1/badges/ac7f36241a23a3a82fc5/maintainability&#41;]&#40;https://codeclimate.com/github/appoptics/appoptics-apm-ruby/maintainability&#41;)
@@ -363,7 +364,7 @@ To make this simpler, we've included a few rake tasks to automate this process:
 
 ```bash
 rake clean                             # make sure no old stuff is around
-rake fetch_oboe_file_from_staging      # download c-files from staging
+rake fetch_oboe_file["stg"]     # download c-files from staging
 rake compile                           # Build the gem's c extension
 ```
 
@@ -381,3 +382,4 @@ See the README in the test directory.
 Copyright (c) 2018 SolarWinds, LLC
 
 Released under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+

data/ext/oboe_metal/extconf.rb

@@ -27,26 +27,39 @@ ao_include = File.join(ext_dir, 'src')
 
 # Download the appropriate liboboe from Staging or Production
 version = File.read(File.join(ao_include, 'VERSION')).strip
-if ENV['OBOE_STAGING'].to_s.downcase == 'true'
+if ENV['OBOE_DEV'].to_s.downcase == 'true'
+  ao_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)
   puts 'Fetching c-lib from STAGING'
 else
   ao_path = File.join('https://agent-binaries.cloud.solarwinds.com/apm/c-lib/', version)
 end
 
-ao_arch = 'x86_64'
+ao_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"
+when "aarch64"
+  ao_arch = "aarch64"
+end
+
 if File.exist?('/etc/alpine-release')
   version = File.read('/etc/alpine-release').strip
 
+  tmp_ao_arch = ao_arch.clone
   ao_arch =
     if Gem::Version.new(version) < Gem::Version.new('3.9')
-      'alpine-libressl-x86_64'
+      "alpine-libressl-#{tmp_ao_arch}"
     else # openssl
-      'alpine-x86_64'
+      "alpine-#{tmp_ao_arch}"
     end
 end
 
 ao_clib = "liboboe-1.0-#{ao_arch}.so.0.0.0"
+ao_clib = "liboboe-1.0-#{ao_arch}.so" if ENV['OBOE_DEV'].to_s.downcase == 'true' # for dev build only
 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)
@@ -138,4 +151,4 @@ if success
     $stderr.puts   '=================================================================='
     create_makefile('oboe_noop', 'noop')
   end
-end
+end

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

@@ -0,0 +1 @@
+ae491260c3b2dfbb2ada97de0c94e78424b2eb5bf19b2b752c25301057270c30

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

@@ -0,0 +1 @@
+a1f5406931ce82b0297bbb1b2b22b151c544e47babc43f0116274f95002ce85e

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

@@ -1 +1 @@
-e1a52a84efc7019c06af710313235a7063f2f73e00ae66e3a4cae9e86f6f03cb
+ede3fcc827faba4d6cf09d2dd59a41325c462c9093994c2c2df202ae57416733

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

@@ -1 +1 @@
-662fccb7d38fbc159cdd31a9fc1b7066e6c9c799dda524b1db5508cdab20274b
+079abfef35a869c3469908a62b97ad6f0f98f85a6f79e3c60265b251dc07dac3

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-10.6.1
+11.1.0
 

data/ext/oboe_metal/src/oboe.h

@@ -169,7 +169,7 @@ typedef struct oboe_metric_tag {
 } oboe_metric_tag_t;
 
 typedef struct oboe_init_options {
-    int version;                            // the version of this structure (currently on version 14)
+    int version;                            // the version of this structure (currently on version 15)
     const char *hostname_alias;             // optional hostname alias
     int log_level;                          // level at which log messages will be written to log file (0-6)
                                             // use LOGLEVEL_DEFAULT for default log level
@@ -182,7 +182,7 @@ typedef struct oboe_init_options {
     const char *reporter;                   // the reporter to be used (ssl, upd, file, null, lambda)
     const char *host;                       // collector endpoint (reporter=ssl), udp address (reporter=udp), or file path (reporter=file)
     const char *service_key;                // the service key
-    const char *trusted_path;               // path to the SSL certificate (only for ssl)
+    const char *certificates;               // content of SSL certificates, passed to gRPC::SslCredentialsOptions() for collector connection verification
     int buffer_size;                        // size of the message buffer
     int trace_metrics;                      // flag indicating if trace metrics reporting should be enabled (default) or disabled
     int histogram_precision;                // the histogram precision (only for ssl)
@@ -194,8 +194,6 @@ typedef struct oboe_init_options {
     const char *proxy;                      // HTTP proxy address and port to be used for the gRPC connection
     int stdout_clear_nonblocking;           // flag indicating if the O_NONBLOCK flag on stdout should be cleared,
                                             // only used in lambda reporter (off=0, on=1, default off)
-    int is_grpc_clean_hack_enabled;         // flag indicating if custom grpc clean hack enabled (default 0)
-    int mode;                               // depreciated; value is ignored
     int metric_format;                      // flag indicating the format of metric (0 = Both; 1 = TransactionResponseTime only; 2 = ResponseTime only; default = 0)
 } oboe_init_options_t;
 

data/ext/oboe_metal/src/oboe_api.cpp

@@ -7,7 +7,7 @@
  **/
 
 #include "oboe_api.h"
-
+#include <algorithm>
 /////// Metatdata ///////
 
 Metadata::Metadata(const oboe_metadata_t *md) {
@@ -202,9 +202,8 @@ bool Context::isSampled() {
 }
 
 std::string Context::validateTransformServiceName(std::string service_key) {
-    char service_key_cpy[71 + 1 + 256];  // Flawfinder: ignore, key=71, colon=1, name<=255
-    memset(service_key_cpy, 0, sizeof(service_key_cpy));
-    strncpy(service_key_cpy, service_key.c_str(), sizeof(service_key_cpy) - 1);  // Flawfinder: ignore
+    char service_key_cpy[71 + 1 + 256] = {0};  // Flawfinder: ignore, key=71, colon=1, name<=255
+    std::copy_n(service_key.begin(), std::min(service_key.size(), sizeof(service_key_cpy)), std::begin(service_key_cpy));
     int len = strlen(service_key_cpy);                                           // Flawfinder: ignore
     int ret = oboe_validate_transform_service_name(service_key_cpy, &len);
 
@@ -591,7 +590,7 @@ Reporter::Reporter(
     std::string reporter,      // the reporter to be used ("ssl", "upd", "file", "null")
     std::string host,          // collector endpoint (reporter=ssl), udp address (reporter=udp), or file path (reporter=file)
     std::string service_key,   // the service key (also known as access_key)
-    std::string trusted_path,  // path to the SSL certificate (only for ssl)
+    std::string certificates,  // content of SSL certificates, passed to gRPC::SslCredentialsOptions() for collector connection verification
 
     int buffer_size,                // size of the message buffer
     int trace_metrics,              // flag indicating if trace metrics reporting should be enabled (default) or disabled
@@ -604,13 +603,11 @@ Reporter::Reporter(
     std::string grpc_proxy,         // HTTP proxy address and port to be used for the gRPC connection
     int stdout_clear_nonblocking,   // flag indicating if the O_NONBLOCK flag on stdout should be cleared,
                                     // only used in lambda reporter (off=0, on=1, default off)
-    int is_grpc_clean_hack_enabled, // flag indicating if custom grpc clean hack enabled (default 0)
-    int w3c_trace_format,           // tag indicating trace id format (0 - legacy Xtrace, 1 - w3c)
     int metric_format               // flag indicating the format of metric (0 = Both; 1 = TransactionResponseTime only; 2 = ResponseTime only; default = 0)
 ) {
     oboe_init_options_t options;
     memset(&options, 0, sizeof(options));
-    options.version = 14;
+    options.version = 15;
     oboe_init_options_set_defaults(&options);
 
     if (hostname_alias != "") {
@@ -631,8 +628,8 @@ Reporter::Reporter(
     if (service_key != "") {
         options.service_key = service_key.c_str();
     }
-    if (trusted_path != "") {
-        options.trusted_path = trusted_path.c_str();
+    if (certificates != "") {
+        options.certificates = certificates.c_str();
     }
     options.buffer_size = buffer_size;
     options.trace_metrics = trace_metrics;
@@ -645,8 +642,6 @@ Reporter::Reporter(
         options.proxy = grpc_proxy.c_str();
     }
     options.stdout_clear_nonblocking = stdout_clear_nonblocking;
-    options.is_grpc_clean_hack_enabled = is_grpc_clean_hack_enabled;
-    options.mode = w3c_trace_format;
     options.metric_format = metric_format;
     init_status = oboe_init(&options);
 }

data/ext/oboe_metal/src/oboe_api.h

@@ -411,7 +411,7 @@ class Reporter : private oboe_reporter_t {
         std::string reporter,      // the reporter to be used ("ssl", "upd", "file", "null")
         std::string host,          // collector endpoint (reporter=ssl), udp address (reporter=udp), or file path (reporter=file)
         std::string service_key,   // the service key (also known as access_key)
-        std::string trusted_path,  // path to the SSL certificate (only for ssl)
+        std::string certificates,  // content of SSL certificates, passed to gRPC::SslCredentialsOptions() for collector connection verification
 
         int buffer_size,                // size of the message buffer
         int trace_metrics,              // flag indicating if trace metrics reporting should be enabled (default) or disabled
@@ -424,8 +424,6 @@ class Reporter : private oboe_reporter_t {
         std::string grpc_proxy,         // HTTP proxy address and port to be used for the gRPC connection
         int stdout_clear_nonblocking,   // flag indicating if the O_NONBLOCK flag on stdout should be cleared,
                                         // only used in lambda reporter (off=0, on=1, default off)
-        int is_grpc_clean_hack_enabled, // flag indicating if custom grpc clean hack enabled (default 0)
-        int w3c_trace_format,           // depreciated; value is ignored
         int metric_format               // flag indicating the format of metric (0 = Both; 1 = TransactionResponseTime only; 2 = ResponseTime only; default = 0)
     );
 

data/ext/oboe_metal/src/oboe_swig_wrap.cc

@@ -6806,8 +6806,6 @@ _wrap_new_Reporter(int argc, VALUE *argv, VALUE self) {
   std::string arg19 ;
   int arg20 ;
   int arg21 ;
-  int arg22 ;
-  int arg23 ;
   int val2 ;
   int ecode2 = 0 ;
   int val4 ;
@@ -6836,14 +6834,10 @@ _wrap_new_Reporter(int argc, VALUE *argv, VALUE self) {
   int ecode20 = 0 ;
   int val21 ;
   int ecode21 = 0 ;
-  int val22 ;
-  int ecode22 = 0 ;
-  int val23 ;
-  int ecode23 = 0 ;
   Reporter *result = 0 ;
   
-  if ((argc < 23) || (argc > 23)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 23)",argc); SWIG_fail;
+  if ((argc < 21) || (argc > 21)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 21)",argc); SWIG_fail;
   }
   {
     std::string *ptr = (std::string *)0;
@@ -6978,17 +6972,7 @@ _wrap_new_Reporter(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode21), Ruby_Format_TypeError( "", "int","Reporter", 21, argv[20] ));
   } 
   arg21 = static_cast< int >(val21);
-  ecode22 = SWIG_AsVal_int(argv[21], &val22);
-  if (!SWIG_IsOK(ecode22)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode22), Ruby_Format_TypeError( "", "int","Reporter", 22, argv[21] ));
-  } 
-  arg22 = static_cast< int >(val22);
-  ecode23 = SWIG_AsVal_int(argv[22], &val23);
-  if (!SWIG_IsOK(ecode23)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode23), Ruby_Format_TypeError( "", "int","Reporter", 23, argv[22] ));
-  } 
-  arg23 = static_cast< int >(val23);
-  result = (Reporter *)new Reporter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19,arg20,arg21,arg22,arg23);
+  result = (Reporter *)new Reporter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19,arg20,arg21);
   DATA_PTR(self) = result;
   return self;
 fail:

data/lib/oboe_metal.rb

@@ -66,6 +66,15 @@ module SolarWindsAPM
         File.truncate(SolarWindsAPM::OboeInitOptions.instance.host, 0)
       end
 
+      ##
+      # hard_clear_all_traces
+      #
+      # Truncates the trace output file to zero by deleting the original bson file
+      #
+      def hard_clear_all_traces
+        File.delete(SolarWindsAPM::OboeInitOptions.instance.host) if File.exist?(SolarWindsAPM::OboeInitOptions.instance.host)
+      end
+
       ##
       # get_all_traces
       #

data/lib/solarwinds_apm/cert/star.appoptics.com.issuer.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIJAMoDz7Npas2/MA0GCSqGSIb3DQEBCwUAMIGOMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEVMBMGA1UECgwMTGlicmF0byBJbmMuMRUwEwYDVQQDDAxBcHBPcHRpY3Mg
+Q0ExJDAiBgkqhkiG9w0BCQEWFXN1cHBvcnRAYXBwb3B0aWNzLmNvbTAeFw0xNzA5
+MTUyMjAxMzlaFw0yNzA5MTMyMjAxMzlaMIGOMQswCQYDVQQGEwJVUzETMBEGA1UE
+CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzEVMBMGA1UECgwM
+TGlicmF0byBJbmMuMRUwEwYDVQQDDAxBcHBPcHRpY3MgQ0ExJDAiBgkqhkiG9w0B
+CQEWFXN1cHBvcnRAYXBwb3B0aWNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOxO0wsGba3iI4r3L5BMST0rAO/gGaUhpQre6nRwVTmPCnLw1bmn
+GdiFgYv/oRRwU+VieumHSQqoOmyFrg+ajGmvUDp2WqQ0It+XhcbaHFiAp2H7+mLf
+cUH6S43/em0WUxZHeRzRupRDyO1bX6Hh2jgxykivlFrn5HCIQD5Hx1/SaZoW9v2n
+oATCbgFOiPW6kU/AVs4R0VBujon13HCehVelNKkazrAEBT1i6RvdOB6aQQ32seW+
+gLV5yVWSPEJvA9ZJqad/nQ8EQUMSSlVN191WOjp4bGpkJE1svs7NmM+Oja50W56l
+qOH5eWermr/8qWjdPlDJ+I0VkgN0UyHVuRECAwEAAaNQME4wHQYDVR0OBBYEFOuL
+KDTFhRQXwlBRxhPqhukrNYeRMB8GA1UdIwQYMBaAFOuLKDTFhRQXwlBRxhPqhukr
+NYeRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJQtH446NZhjusy6
+iCyvmnD95ybfNPDpjHmNx5n9Y6w9n+9y1o3732HUJE+WjvbLS3h1o7wujGKMcRJn
+7I7eTDd26ZhLvnh5/AitYjdxrtUkQDgyxwLFJKhZu0ik2vXqj0fL961/quJL8Gyp
+hNj3Nf7WMohQMSohEmCCX2sHyZGVGYmQHs5omAtkH/NNySqmsWNcpgd3M0aPDRBZ
+5VFreOSGKBTJnoLNqods/S9RV0by84hm3j6aQ/tMDIVE9VCJtrE6evzC0MWyVFwR
+ftgwcxyEq5SkiR+6BCwdzAMqADV37TzXDHLjwSrMIrgLV5xZM20Kk6chxI5QAr/f
+7tsqAxw=
+-----END CERTIFICATE-----

data/lib/solarwinds_apm/inst/redis.rb

@@ -57,10 +57,9 @@ module SolarWindsAPM
         # KVOp (no KVKey)
 
         def self.included(klass)
-          # We wrap two of the Redis methods to instrument
-          # operations
-          SolarWindsAPM::Util.method_alias(klass, :call, ::Redis::Client)
-          SolarWindsAPM::Util.method_alias(klass, :call_pipeline, ::Redis::Client)
+          # call_pipelined is alias of call in redisclient middlewares
+          SolarWindsAPM::Util.method_alias(klass, :call, ::RedisClient)
+          SolarWindsAPM::Util.method_alias(klass, :call_pipelined, ::RedisClient)
         end
 
         # Given any Redis operation command array, this method
@@ -69,12 +68,14 @@ module SolarWindsAPM
         # @param command [Array] the Redis operation array
         # @param r [Return] the return value from the operation
         # @return [Hash] the Key/Values to report
-        def extract_trace_details(command, r)
+        def extract_trace_details(command, r, config)
+          SolarWindsAPM.logger.debug "extract_trace_details command => #{command.inspect}"
           kvs = {}
           op = command.first
+          op = op.to_sym
 
           kvs[:KVOp] = command[0]
-          kvs[:RemoteHost] = @options[:host]
+          kvs[:RemoteHost] = config.host
           unless NO_KEY_OPS.include?(op) || op == :del && command[1..-1].flatten.count > 1
             if command[1].is_a?(Array)
               kvs[:KVKey] = command[1].first
@@ -115,7 +116,7 @@ module SolarWindsAPM
               kvs[:KVHit] = r.nil? ? 0 : 1
 
             when :hdel, :hexists, :hget, :hset, :hsetnx
-              kvs[:field] = command[2] unless command[2].is_a?(Array)
+              kvs[:field] = command[2] unless (command[2] && command[3]) # replace the idiom of command[2].is_a?(Array)
               if op == :hget
                 kvs[:KVHit] = r.nil? ? 0 : 1
               end
@@ -136,7 +137,7 @@ module SolarWindsAPM
                 else
                   kvs[:Script] = command[2]
                 end
-              elsif command[1] == :exists
+              elsif command[1] == "exists"
                 if command[2].is_a?(Array)
                   kvs[:KVKey] = command[2].inspect
                 else
@@ -166,6 +167,10 @@ module SolarWindsAPM
               end
             end # case op
           end # if KV_COLLECT_MAP[op]
+          # turn every string into number
+          # kvs.each do |k,v|
+          #   kvs[k] = v.to_i if v.is_a(String)
+          # end
         rescue StandardError => e
           SolarWindsAPM.logger.debug "[solarwinds_apm/redis] Error collecting redis KVs: #{e.message}"
           SolarWindsAPM.logger.debug e.backtrace.join('\n')
@@ -178,16 +183,17 @@ module SolarWindsAPM
         #
         # @param pipeline [Redis::Pipeline] the Redis pipeline instance
         # @return [Hash] the Key/Values to report
-        def extract_pipeline_details(pipeline)
+        def extract_pipeline_details(commands, config)
+          SolarWindsAPM.logger.debug "extract_pipeline_details command => #{commands.inspect}"
           kvs = {}
 
-          kvs[:RemoteHost] = @options[:host]
+          kvs[:RemoteHost] = config.host
           kvs[:Backtrace] = SolarWindsAPM::API.backtrace if SolarWindsAPM::Config[:redis][:collect_backtraces]
 
-          command_count = pipeline.commands.count
+          command_count = commands.count
           kvs[:KVOpCount] = command_count
 
-          kvs[:KVOp] = if pipeline.commands.first == :multi
+          kvs[:KVOp] = if commands.first == :multi
             :multi
           else
             :pipeline
@@ -197,7 +203,7 @@ module SolarWindsAPM
           # of ops is reasonable
           if command_count < 12
             ops = []
-            pipeline.commands.each do |c|
+            commands.each do |c|
               ops << c.first
             end
             kvs[:KVOps] = ops.join(', ')
@@ -210,17 +216,19 @@ module SolarWindsAPM
         end
 
         #
-        # The wrapper method for Redis::Client.call.  Here
+        # The wrapper method for RedisClient.call.  Here
         # (when tracing) we capture KVs to report and pass
         # the call along
         #
-        def call_with_sw_apm(command, &block)
+        def call_with_sw_apm(command, config, &block)
+          SolarWindsAPM.logger.debug "call_with_sw_apm command => #{command.inspect}"
           if SolarWindsAPM.tracing?
             SolarWindsAPM::API.log_entry(:redis, {})
 
             begin
-              r = call_without_sw_apm(command, &block)
-              report_kvs = extract_trace_details(command, r)
+              r = call_without_sw_apm(command, config, &block)
+              report_kvs = extract_trace_details(command, r, config)
+              SolarWindsAPM.logger.debug "call_with_sw_apm command => #{report_kvs.inspect}"
               r
             rescue StandardError => e
               SolarWindsAPM::API.log_exception(:redis, e)
@@ -230,26 +238,25 @@ module SolarWindsAPM
             end
 
           else
-            call_without_sw_apm(command, &block)
+            call_without_sw_apm(command, config, &block)
           end
         end
 
         #
-        # The wrapper method for Redis::Client.call_pipeline.  Here
+        # The wrapper method for RedisClient.call_pipeline.  Here
         # (when tracing) we capture KVs to report and pass the call along
-        #
-        def call_pipeline_with_sw_apm(pipeline)
+        # 5.0.0 + removed the deprecated pipelined and multi signature. Commands now MUST be called on the block argument, not the original redis instance
+        def call_pipelined_with_sw_apm(commands, config, &block)
+          SolarWindsAPM.logger.debug "call_pipelined_with_sw_apm command => #{commands.inspect}"
           if SolarWindsAPM.tracing?
             # Fall back to the raw tracing API so we can pass KVs
             # back on exit (a limitation of the SolarWindsAPM::API.trace
             # block method)  This removes the need for an info
             # event to send additonal KVs
             SolarWindsAPM::API.log_entry(:redis, {})
-
-            report_kvs = extract_pipeline_details(pipeline)
-
+            report_kvs = extract_pipeline_details(commands, config)
             begin
-              call_pipeline_without_sw_apm(pipeline)
+              call_pipelined_without_sw_apm(commands, config, &block)
             rescue StandardError => e
               SolarWindsAPM::API.log_exception(:redis, e)
               raise
@@ -257,7 +264,7 @@ module SolarWindsAPM
               SolarWindsAPM::API.log_exit(:redis, report_kvs)
             end
           else
-            call_pipeline_without_sw_apm(pipeline)
+            call_pipelined_without_sw_apm(commands, config, &block)
           end
         end
       end
@@ -266,8 +273,8 @@ module SolarWindsAPM
 end
 
 if SolarWindsAPM::Config[:redis][:enabled]
-  if defined?(Redis) && Gem::Version.new(Redis::VERSION) >= Gem::Version.new('3.0.0')
-    SolarWindsAPM.logger.info '[solarwinds_apm/loading] Instrumenting redis' if SolarWindsAPM::Config[:verbose]
-    SolarWindsAPM::Util.send_include(Redis::Client, SolarWindsAPM::Inst::Redis::Client)
+  if defined?(::RedisClient)
+    SolarWindsAPM.logger.info "[solarwinds_apm/loading] Instrumenting redis #{Redis::VERSION}" if SolarWindsAPM::Config[:verbose]
+    ::RedisClient.register(SolarWindsAPM::Inst::Redis::Client)
   end
 end