solarwinds_apm 5.1.4 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b56699604e8448a606d69ed23ba957622c4b70d8d2cbcf070526105f2dcff87
-  data.tar.gz: 5b0f55643f2ea9072418c66c62a6f9ea4ca87fea74fbcec66574a341e0510c82
+  metadata.gz: 8298bf959acf2663351b05afeb78ffa573c02107f9588bbc925a990e35675e4d
+  data.tar.gz: a67822c4554525b9894cdb578b48cf51de562ecd1b5ba353ed58f037ed88daf9
 SHA512:
-  metadata.gz: f77f2c0e8315832f92204bc0cdd29d6588f83cbf2751f8dfac2fb0402c65091c96238f0192da4473b99a0cf5197b44a66839f7d1c58fb5521bd11ce1a96defc6
-  data.tar.gz: 53c8e3740a5361fa4f9e403cf863f2044d821a58a7c42ac8708c859781c363b168af78e39da50b2ceeda783b752205cf0c0cb5bdf86afa7ffa4e63e80ae4dffe
+  metadata.gz: 9998cc5ed8152951dcfbe0a997ac952b89a32eb7fcbcfe3b3cf51a87231606d0471eddfa9d5a14be58780904681776a99b99abfa5dfbd4159d791d8ddaea556c
+  data.tar.gz: 661af15bb3b3a14a361f7e4f95b3367c2fbb459b19b9b7c1894480f9f85050c68fca6ce7029ed9cb7bb7fce82d8cd593c746989311ed8d68fbd4ba2c4a687c3e

data/CHANGELOG.md

@@ -3,6 +3,19 @@ https://github.com/solarwindscloud/solarwinds-apm-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# solarwinds_apm 5.1.6 (03/14/2023)
+
+This release includes the following features:
+
+* Update latest liboboe library (12.0.0)
+* Remove centos as testing environments and include amazonlinux as alternatives of RHEL distro
+* Include sanitize RemoteURL for kvs (p.s. RemoteHost is sanitized in library code)
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/solarwinds_apm/versions/5.1.5
+
+
 # solarwinds_apm 5.1.4 (11/23/2022)
 
 This release includes the following features:

data/README.md

@@ -11,9 +11,9 @@ 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/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)
+[![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)
+[![C++ Tests](https://github.com/solarwindscloud/solarwinds-apm-ruby/actions/workflows/run_cpluplus_tests.yml/badge.svg)](https://github.com/solarwindscloud/solarwinds-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;)
 

data/ext/oboe_metal/extconf.rb

@@ -58,8 +58,7 @@ if File.exist?('/etc/alpine-release')
     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_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)

data/ext/oboe_metal/extconf_local.rb

@@ -24,7 +24,7 @@ ext_dir = File.expand_path(File.dirname(__FILE__))
 # the SolarWindsAPM libs.
 ao_lib_dir = File.join(ext_dir, 'lib')
 ao_path = '../../../oboe/factory-output'
-ao_clib = "liboboe-1.0-x86_64.so.0.0.0"
+ao_clib = "liboboe-1.0-x86_64.so"
 ao_item = File.join(ao_path, ao_clib)
 clib = File.join(ao_lib_dir, ao_clib)
 

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

@@ -0,0 +1 @@
+d9c280de4ab597fe7d3405a405c07f7e27ae4fb2cba7502f3893335bff119c3b

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

@@ -0,0 +1 @@
+7864bee37bcaeacef1c3ffae2db3ae2d163ef18ebb107fe11228122211e6ddb4

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

@@ -0,0 +1 @@
+48849897b168cde0de01b3c1355d0343e687cbec075f5970d88f166bd5182045

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

@@ -0,0 +1 @@
+139fd6c84d20b5f4b12931a0ecf6630b8b0cae14792d05000c29b8d35aa7332c

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-11.1.0
+12.0.0
 

data/ext/oboe_metal/src/oboe.h

@@ -750,7 +750,7 @@ int oboe_sample_is_enabled(oboe_settings_cfg_t *cfg);
 int oboe_tracing_decisions(oboe_tracing_decisions_in_t *in, oboe_tracing_decisions_out_t *out);
 
 /* Oboe configuration interface. */
-
+#ifndef _WIN32
 /**
  * Check if the Oboe library is compatible with a given version.revision.
  *
@@ -762,7 +762,7 @@ int oboe_tracing_decisions(oboe_tracing_decisions_in_t *in, oboe_tracing_decisio
  * @return Non-zero if the Oboe library is considered compatible with the specified revision.
  */
 extern int oboe_config_check_version(int version, int revision);
-
+#endif
 /**
  * Get the Oboe library version number.
  *

data/ext/oboe_metal/src/oboe_api.cpp

@@ -694,7 +694,11 @@ std::string Reporter::getType() {
 /////// Config ///////
 
 bool Config::checkVersion(int version, int revision) {
+#ifndef _WIN32
     return (oboe_config_check_version(version, revision) != 0);
+#else
+    return true;
+#endif
 }
 
 std::string Config::getVersionString() {

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

@@ -29,10 +29,10 @@ module SolarWindsAPM
       say "-------------------"
       say ""
       say "SolarWindsAPM Installation Overview:"
-      say "https://documentation.solarwinds.com/en/success_center/swaas/"
+      say "https://documentation.solarwinds.com/en/success_center/observability"
       say ""
       say "More information on instrumenting Ruby applications can be found here:"
-      say "https://documentation.solarwinds.com/en/success_center/swaas/default.htm#cshid=app-add-ruby-agent"
+      say "https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent"
     end
     # rubocop:enable Metrics/MethodLength
 

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

@@ -3,11 +3,11 @@
 # Copyright (c) 2019 SolarWinds, LLC.
 # All rights reserved.
 
-# SolarWindsAPM Configuration for the Ruby Agent aka solarwinds_apm gem
+# SolarWindsAPM Configuration for the Ruby Library aka solarwinds_apm gem
 # https://cloud.solarwinds.com/
 #
-# More information on configuring the Ruby Agent can be found here:
-# https://documentation.solarwinds.com/en/success_center/swaas/default.htm#cshid=config-ruby-agent
+# More information on configuring the Ruby Library can be found here:
+# https://documentation.solarwinds.com/en/success_center/observability/default.htm#cshid=config-ruby-agent
 #
 # The initial settings in this file represent the defaults
 
@@ -46,9 +46,11 @@ if defined?(SolarWindsAPM::Config)
   # to SolarWinds is still encrypted using SSL/TLS.
   #
   # It is recommended to configure the proxy in this file or as SW_APM_PROXY
-  # environment variable. However, the agent's underlying network library will
-  # use a system-wide proxy defined in the environment variables grpc_proxy,
-  # https_proxy or http_proxy if no SolarWindsAPM-specific configuration is set.
+  # environment variable. However, the underlying network library for the Ruby 
+  # Instrumentation Library will use a system-wide proxy defined in the environment 
+  # variables grpc_proxy, https_proxy or http_proxy if no SolarWindsAPM-specific 
+  # configuration is set.
+  # 
   # Please refer to gRPC environment variables for more information.
   #
   # SolarWindsAPM::Config[:http_proxy] = http://<proxyHost>:<proxyPort>

data/lib/solarwinds_apm/inst/curb.rb

@@ -30,6 +30,7 @@ module SolarWindsAPM
           kvs[:RemoteURL] = url.split('?').first
         end
 
+        kvs[:RemoteURL] = SolarWindsAPM::Util.sanitize_uri(kvs[:RemoteURL])
         kvs[:HTTPMethod] = verb if verb
 
         kvs

data/lib/solarwinds_apm/inst/httpclient.rb

@@ -23,6 +23,7 @@ module SolarWindsAPM
           kvs[:RemoteURL] = uri.to_s.split('?').first
         end
 
+        kvs[:RemoteURL] = SolarWindsAPM::Util.sanitize_uri(kvs[:RemoteURL])
         kvs[:HTTPMethod] = SolarWindsAPM::Util.upcase(method)
         kvs
       rescue => e

data/lib/solarwinds_apm/inst/redis.rb

@@ -274,7 +274,7 @@ end
 
 if SolarWindsAPM::Config[:redis][:enabled]
   if defined?(::RedisClient)
-    SolarWindsAPM.logger.info "[solarwinds_apm/loading] Instrumenting redis #{Redis::VERSION}" if SolarWindsAPM::Config[:verbose]
+    SolarWindsAPM.logger.info "[solarwinds_apm/loading] Instrumenting redis through RedisClient #{RedisClient::VERSION}" if SolarWindsAPM::Config[:verbose]
     ::RedisClient.register(SolarWindsAPM::Inst::Redis::Client)
   end
 end

data/lib/solarwinds_apm/inst/typhoeus.rb

@@ -37,7 +37,7 @@ module SolarWindsAPM
           # Conditionally log query params
           uri = URI(response.effective_url)
           kvs[:RemoteURL] = SolarWindsAPM::Config[:typhoeus][:log_args] ? uri.to_s : uri.to_s.split('?').first
-
+          kvs[:RemoteURL] = SolarWindsAPM::Util.sanitize_uri(kvs[:RemoteURL])
           response
         rescue => e
           SolarWindsAPM::API.log_exception(:typhoeus, e)

data/lib/solarwinds_apm/util.rb

@@ -113,6 +113,24 @@ module SolarWindsAPM
         end
       end
 
+      ##
+      # sanitize
+      #
+      # Remove the potential username and password from the uri user provided for reporting
+      def sanitize_uri(uri)
+        return uri if uri.nil?
+        begin
+          parsed_uri = URI.parse(uri)
+          parsed_uri.user = nil
+          sanitized_uri = parsed_uri.to_s
+        rescue StandardError => e
+          sanitized_uri = uri
+          SolarWindsAPM.logger.debug "[solarwinds_apm/debug] SolarWindsAPM::Util.sanitize_uri: could not sanitize #{uri}; caused by #{e.message}."
+        end
+        sanitized_uri
+      end
+
+
       ##
       # upcase
       #

data/lib/solarwinds_apm/version.rb

@@ -8,7 +8,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 5 # breaking,
     MINOR  = 1 # feature,
-    PATCH  = 4 # fix => BFF
+    PATCH  = 6 # fix => BFF
     PRE    = nil # for pre-releases into packagecloud, set to nil for production releases into rubygems
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/solarwinds_apm.gemspec

@@ -33,10 +33,10 @@ Automatic tracing and metrics for Ruby applications. Get started at cloud.solarw
               'ext/oboe_metal/src/bson/bson.h',
               'ext/oboe_metal/src/bson/platform_hacks.h',
               'ext/oboe_metal/src/VERSION',
-              'ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.0.0.0.sha256',
-              'ext/oboe_metal/lib/liboboe-1.0-x86_64.so.0.0.0.sha256',
-              'ext/oboe_metal/lib/liboboe-1.0-aarch64.so.0.0.0.sha256',
-              'ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.0.0.0.sha256'
+              'ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.sha256',
+              'ext/oboe_metal/lib/liboboe-1.0-x86_64.so.sha256',
+              'ext/oboe_metal/lib/liboboe-1.0-aarch64.so.sha256',
+              'ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.sha256'
              ]
   s.files += ['lib/solarwinds_apm/cert/star.appoptics.com.issuer.crt']
   s.files -= ['build_gem.sh',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -77,10 +77,10 @@ files:
 - ext/oboe_metal/extconf.rb
 - ext/oboe_metal/extconf_local.rb
 - ext/oboe_metal/lib/.keep
-- ext/oboe_metal/lib/liboboe-1.0-aarch64.so.0.0.0.sha256
-- ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.0.0.0.sha256
-- ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.0.0.0.sha256
-- ext/oboe_metal/lib/liboboe-1.0-x86_64.so.0.0.0.sha256
+- ext/oboe_metal/lib/liboboe-1.0-aarch64.so.sha256
+- ext/oboe_metal/lib/liboboe-1.0-alpine-aarch64.so.sha256
+- ext/oboe_metal/lib/liboboe-1.0-alpine-x86_64.so.sha256
+- ext/oboe_metal/lib/liboboe-1.0-x86_64.so.sha256
 - ext/oboe_metal/noop/noop.c
 - ext/oboe_metal/src/README.md
 - ext/oboe_metal/src/VERSION

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

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

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

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

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

@@ -1 +0,0 @@
-ede3fcc827faba4d6cf09d2dd59a41325c462c9093994c2c2df202ae57416733

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

@@ -1 +0,0 @@
-079abfef35a869c3469908a62b97ad6f0f98f85a6f79e3c60265b251dc07dac3