solarwinds_apm 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62089a2d5a8a8728332f7e5b98c8d11c9f84523ec187b0420c84f9dc5951191
-  data.tar.gz: d5aedff305013aea008f886362907ffd6ed1f36f73d8a2dc9ee5d08968b80d9e
+  metadata.gz: c274381dffd0448ab7bd8075035f550bd7374161af063c8b2eb53b1170b71dc3
+  data.tar.gz: af7a66a8329b4c357a1368793d58b2be3e5c6db2a2d56f73287645f668e0cd9b
 SHA512:
-  metadata.gz: b9d8c4dc8e9847308f68d747b7262da560b0bff4d1653bf92856bc2599a2f600291daeaeb28f7e9c96ede12a408117b434b4bb8cefd9eeb0f6a7f5ec6838eb6b
-  data.tar.gz: 5a1f702b33e82fbc0464f7aed84411d55d5a1eaab38b47fc6f83dbf639673180698ec971e18b8cf9d3811a1b0441b09a53686103315b23c540df902fbcf67d76
+  metadata.gz: d3ce5239fa623d41cb982578c51280caf4f1c7b7e152dfd97232f7e6fbc1d0faf0453ad30ba6e2e04fbc22a0f319f2c2569c0a1b53ce3f9a4e9f4924c16d8252
+  data.tar.gz: 45b3d421e0acc5a90cdb9e61707d17e4739baf70d8ee916540b9e391c35ebd72c04b4493725358f94458c5ae0431e62f44fb5b087a08f86038bfd8b07d4ac398

data/.github/CODEOWNERS

@@ -1 +1 @@
-*  @cheempz @xuan-cao-swi @tammy-baylis-swi
+*  @cheempz @xuan-cao-swi @tammy-baylis-swi @solarwindscloud/apm-instrumentation

data/.github/workflows/test_on_4_linux.yml

@@ -4,72 +4,20 @@
 name: Run Ruby Tests on 4 Linux
 
 on:
-  push:
+  pull_request:
+    types:
+      - closed
     paths-ignore:
       - 'test/run_tests/Dockerfile_*'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-env:
-  GHRC: ghcr.io/appoptics/appoptics-apm-ruby/apm_ruby
-  DOCKERFILE: test/run_tests/Dockerfile
-
 jobs:
-
-#-------------------------------------------------------------------------------
-# TODO: figure out how to build images first if necessary
-#
-# ********* this is not working because we don't have a    *************
-# ********* reference to the commit of the previous GH run *************
-#
-#  build_images:
-#    name: Build docker images if necessary
-#    runs-on: ubuntu-latest
-#
-#    strategy:
-#      fail-fast: true
-#      matrix:
-#        os: [ ubuntu, debian, centos, alpine ]
-#
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#
-#
-#  ##    comment out to get a debug session
-#  ##    only works with ubuntu and debian, because it uses apt:
-##      - name: tmate debugging session
-##        uses: mxschmitt/action-tmate@v3
-##        with:
-##          sudo: false
-#
-#      - name: check modified files
-#        id:   check_files
-#        run:  |
-#          git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep Dockerfile_
-#          echo ::set-output name=check_dockerfiles::$?
-##          git diff --name-only HEAD^ HEAD | grep [D]ockerfile_
-##          echo ::set-output name=check_dockerfiles::$?
-#
-#      - name: ghcr.io login ... build and publish images if needed
-#        uses: docker/login-action@v1
-#        if: ${{ steps.check_files.outputs.check_dockerfiles == 0}}
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#
-#      - name: Build and publish new Docker image
-#        if: ${{ steps.check_files.outputs.check_dockerfiles == 0 }}
-#        run: |
-#          docker build -f ${{ env.DOCKERFILE }}_${{ matrix.os }} -t ${{ env.GHRC }}_${{ matrix.os }} .
-#          docker push ${{ env.GHRC }}_${{ matrix.os }}
-
-#-------------------------------------------------------------------------------
   all_linux_test:
+    if: github.event.pull_request.merged == true
     name: ${{ matrix.os }} - ruby ${{ matrix.ruby }}
     runs-on: ubuntu-latest
-#    needs: build_images
+    # needs: build_images
 
     strategy:
       fail-fast: false
@@ -115,10 +63,10 @@ jobs:
           - 5672:5672
         options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
       mongo:
-        image: mongo:5
+        image: mongo:6
         ports:
           - 27017:27017
-        options: "--health-cmd \"mongo --quiet --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)'\" --health-interval 10s --health-timeout 5s --health-retries 5"
+        options: --health-cmd "mongosh --quiet --eval 'quit(db.runCommand({ping:1}).ok ? 0:2)'" --health-interval 10s --health-timeout 5s --health-retries 5
       postgres:
         image: postgres:latest
         env:
@@ -140,7 +88,7 @@ jobs:
 
     steps:
     - name: Checkout ${{ github.ref }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: print some info
       run: |

data/.github/workflows/test_on_ubuntu.yml

@@ -0,0 +1,107 @@
+# Copyright (c) 2021 SolarWinds, LLC.
+# All rights reserved.
+
+name: Run Ruby Tests on Ubuntu (Push Event)
+
+on:
+  push:
+    branches-ignore:
+      - main
+    paths-ignore:
+      - 'test/run_tests/Dockerfile_*'
+  workflow_dispatch:
+
+jobs:
+
+  ubuntu_test:
+    name: ubuntu - ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.1', '3.0', '2.7', '2.6']
+
+    container:
+       image: ghcr.io/${{ github.repository }}/apm_ruby_ubuntu
+
+    env:
+      SW_APM_GEM_TEST: true
+      SW_APM_REPORTER: file
+      SW_APM_COLLECTOR: /tmp/sw_apm_traces.bson
+      SW_APM_REPORTER_FILE_SINGLE: false
+      OBOE_STAGING: true
+      MONGO_SERVER: "mongo"
+      RABBITMQ_SERVER: "rabbitmq"
+      MEMCACHED_SERVER: "memcached"
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_HOST: "mysql"
+      MYSQL_DATABASE: "test_db"
+      POSTGRES_DB: "test_db"
+      DOCKER_MYSQL_PASS: "admin"
+      DOCKER_PSQL_PASS: "postgres"
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
+      POSTGRES_HOST: "postgres"
+      QUERY_LOG_FILE: "/tmp/sw_apm_query_logs.txt"
+      REDIS_PASSWORD: "redis_pass"
+      TEST_RUNS_TO_FILE: "true"
+
+    services:
+      memcached:
+        image: memcached:latest
+        ports:
+          - 11211:11211
+        options: --health-cmd "timeout 5 bash -c 'cat < /dev/null > /dev/udp/127.0.0.1/11211'" --health-interval 10s --health-timeout 5s --health-retries 5
+      rabbitmq:
+        image: rabbitmq:latest
+        ports:
+          - 5672:5672
+        options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
+      mongo:
+        image: mongo:6
+        ports:
+          - 27017:27017
+        options: --health-cmd "mongosh --quiet --eval 'quit(db.runCommand({ping:1}).ok ? 0:2)'" --health-interval 10s --health-timeout 5s --health-retries 5
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: test_db
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mysql:
+        image: mariadb:latest
+        env:
+          MYSQL_USER: user
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: test_db
+          MYSQL_ROOT_PASSWORD: admin
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+    - name: Checkout ${{ github.ref }}
+      uses: actions/checkout@v3
+
+    - name: print some info
+      run: |
+        user=`whoami`
+        pwd=`pwd`
+        echo "User: $user"
+        echo "Current dir: $pwd"
+        echo "Home dir: $HOME"
+        echo "Branch: ${GITHUB_REF#refs/*/}"
+
+    - name: ruby tests
+      run: |
+        export HOME=/root
+        export PUSH_EVENT=REGULAR_PUSH
+        test/run_tests/ruby_setup.sh
+        version=`rbenv versions --bare | grep ${{ matrix.ruby }}`
+        rbenv global $version
+        echo "testing with ruby version: $version"
+        test/run_tests/run_tests.sh -r $version

data/.gitignore

@@ -41,3 +41,11 @@ gemfiles/vendor*
 lib/libsolarwinds_apm.so
 vendor/
 
+# test
+tmp.rb
+apm.collector.st-ssp.solarwinds.com
+test/run_tests/.ruby_version_ubuntu
+
+
+# mac DS_Store
+.DS_Store

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

@@ -1 +1 @@
-e1a52a84efc7019c06af710313235a7063f2f73e00ae66e3a4cae9e86f6f03cb
+08e53f05aebb831b3bb27410ad3163e193b4e3d7dbef3ac280e799f024623d95

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

@@ -1 +1 @@
-662fccb7d38fbc159cdd31a9fc1b7066e6c9c799dda524b1db5508cdab20274b
+69ae267c2a31e29b1f518f9a30149e3bce1dd9a9e3a5a1c91c032f1b15ba3360

data/ext/oboe_metal/src/VERSION

@@ -1,2 +1,2 @@
-10.6.1
+11.0.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/oboe_init_options.rb

@@ -33,8 +33,8 @@ module SolarWindsAPM
 
       # the service key
       @service_key = read_and_validate_service_key
-      # path to the SSL certificate (only for ssl)
-      @trusted_path = ENV['SW_APM_TRUSTEDPATH'] || ''
+      # certificate content
+      @certificates = read_certificates
       # size of the message buffer
       @buffer_size = (ENV['SW_APM_BUFSIZE'] || -1).to_i
       # flag indicating if trace metrics reporting should be enabled (default) or disabled
@@ -74,7 +74,7 @@ module SolarWindsAPM
         @reporter,               # 7
         @host,                   # 8
         @service_key,            # 9
-        @trusted_path,           #10
+        @certificates,           #10
         @buffer_size,            #11
         @trace_metrics,          #12
         @histogram_precision,    #13
@@ -84,9 +84,7 @@ module SolarWindsAPM
         @ec2_md_timeout,         #17
         @grpc_proxy,             #18
         0,                       #19 arg for lambda (no lambda for ruby yet)
-        1,                       #20 arg for grpc hack, hardcoded to include hack
-        1,                       #21 arg for trace id format to use w3c format
-        @metric_format           #22
+        @metric_format           #20
       ]
     end
 
@@ -190,6 +188,25 @@ module SolarWindsAPM
       proxy
     end
 
+    def read_certificates
+
+      file = ''
+      file = "#{File.expand_path File.dirname(__FILE__)}/cert/star.appoptics.com.issuer.crt" if ENV["SW_APM_COLLECTOR"]&.include? "appoptics.com"
+      file = ENV['SW_APM_TRUSTEDPATH'] if (!ENV['SW_APM_TRUSTEDPATH'].nil? && !ENV['SW_APM_TRUSTEDPATH']&.empty?)
+      
+      return String.new if file.empty?
+      
+      begin
+        certificate = File.open(file,"r").read
+      rescue StandardError => e
+        SolarWindsAPM.logger.error "[solarwinds_apm/oboe_options] certificates: #{file} doesn't exist or caused by #{e.message}."
+        certificate = String.new
+      end
+      
+      return certificate
+
+    end
+
     def determine_the_metric_model
       if ENV['SW_APM_COLLECTOR']&.include? "appoptics.com"
         return 1

data/lib/solarwinds_apm/version.rb

@@ -8,7 +8,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 5 # breaking,
     MINOR  = 1 # feature,
-    PATCH  = 2 # fix => BFF
+    PATCH  = 3 # 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

@@ -36,6 +36,7 @@ Automatic tracing and metrics for Ruby applications. Get started at cloud.solarw
               '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'
              ]
+  s.files += ['lib/solarwinds_apm/cert/star.appoptics.com.issuer.crt']
   s.files -= ['build_gem.sh',
               'build_gem_upload_to_packagecloud.sh',
               'Rakefile']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Maia Engeli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -70,6 +70,7 @@ files:
 - ".github/workflows/scripts/test_install.rb"
 - ".github/workflows/swig/swig-v4.0.2.tar.gz"
 - ".github/workflows/test_on_4_linux.yml"
+- ".github/workflows/test_on_ubuntu.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".whitesource"
@@ -129,6 +130,7 @@ files:
 - lib/solarwinds_apm/api/metrics.rb
 - lib/solarwinds_apm/api/util.rb
 - lib/solarwinds_apm/base.rb
+- lib/solarwinds_apm/cert/star.appoptics.com.issuer.crt
 - lib/solarwinds_apm/config.rb
 - lib/solarwinds_apm/frameworks/grape.rb
 - lib/solarwinds_apm/frameworks/padrino.rb