solarwinds_apm 5.0.0 → 5.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fe916dcebeb8fe9c3dcb5a0ffc6e03d3f07461c4fe2e17d9890a5a3ef7d7d9
-  data.tar.gz: 68afd25f4e027bfcb9f6766e2e858d285a67f7ecb5e34a4a59ed2f8c1b26eae1
+  metadata.gz: 3ae0d8d06b4f2387cf756bc56c5589eb5d751e6586f3e41574df7d10d0145176
+  data.tar.gz: 7e6889e2c869e4bf4e6c470bb08f6899b86490a3616cea22da32b748fff8dec8
 SHA512:
-  metadata.gz: 6e37f758c9a3fa5a27f7a57e4f1cd41ec242d200bd30c98793a87e4ce022c92060fe9406f1ecc617a4327d7e52043b3eeeda215232c017d48f535cdae647dc4e
-  data.tar.gz: bf4282273f84c5350034539377f898a65b99eb8e5190cbeb1d059de3584fb402aa8750cd4097c31e6f103d6341ea6ae523b6bde4c0aecda5ebe4639e208d766b
+  metadata.gz: 1003698002dea40e3bdad632b31354d5ad9bc638b46aa3d239c36f20df92d6730ecfa4f3a7af3d0896570e8901e9d102f0968092e3d7651e85bbdabec48f0f72
+  data.tar.gz: 18aa4ac8adc25f685edafeb7600cda3481419c3b8e611c4c56b2ff518a8294ca5d687e9508cb6e325c1f0cd477cd14c6b61447d1b27653269c973dc61e369345

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*  @cheempz @xuan-cao-swi @tammy-baylis-swi

data/.github/workflows/build_and_release_gem.yml

@@ -40,11 +40,11 @@ jobs:
           ./autogen.sh && ./configure && make && sudo make install
           cd -
 
-      - name: Download files from files.appoptics.com and create swig wrapper
+      - name: Download files from cloud.solarwinds.com and create swig wrapper
         env:
           TRACE_BUILD_TOKEN: ${{ secrets.TRACE_BUILD_RUBY_ACTIONS_API_TOKEN }}
         run: |
-          bundle exec rake oboe_files_sw_apm_fetch
+          bundle exec rake fetch_oboe_file_from_prod
           bundle exec rake oboe_verify
 
       - name: Build Gem and upload to Rubygems
@@ -75,38 +75,34 @@ jobs:
           echo "local and rubygems checksum not matching, gem needs to be yanked from rubygems.org"
           exit 1
 
-      # this action is not working anymore
-#      - name: Create release draft that includes the checksum
-#        uses: actions/github-script@v3
-#        with:
-#          github-token: ${{secrets.GITHUB_TOKEN}}
-#          script: |
-#            github.repos.createRelease({
-#              owner: "solarwinds-apm",
-#              repo: "appoptics-apm-ruby",
-#              body: "SHA256 checksum: ${{ steps.build.outputs.checksum }}",
-#              tag_name: "${{ steps.build.outputs.gem_version }}",
-#              name: "${{ steps.build.outputs.gem_version }}",
-#              draft: true
-#            })
-
       - name: Create release draft that includes the checksum
-        run: |
-          curl \
-             -X POST \
-             -H "Accept: application/vnd.github.v3+json" \
-             https://api.github.com/repos/OWNER/REPO/releases \
-             -d '{"tag_name":"${{ steps.build.outputs.gem_version }}","name":"${{ steps.build.outputs.gem_version }}","body":"SHA256 checksum: ${{ steps.build.outputs.checksum }}","draft":true}'
-
-      # may need a bit of time for the gem to become available (sleep 1)
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.repos.createRelease({
+              owner: "solarwindscloud",
+              repo: "solarwinds-apm-ruby",
+              body: "SHA256 checksum: ${{ steps.build.outputs.checksum }}",
+              tag_name: "${{ steps.build.outputs.gem_version }}",
+              name: "${{ steps.build.outputs.gem_version }}",
+              draft: true
+            })
+
+      # may need a bit of time for the gem to become available (-> sleep 1)
       - name: Download new Rubygem from rubygems.org and test
         working-directory: .github/workflows/
         env:
-          SW_APM_SERVICE_KEY: ${{ secrets.APPOPTICS_SERVICE_KEY }}
-          SW_APM_COLLECTOR: ${{ secrets.APPOPTICS_COLLECTOR}}
+          SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY_PROD }}
+          SW_APM_COLLECTOR: ${{ secrets.SW_APM_COLLECTOR_PROD}}
         run: |
           sleep 1
           gem install solarwinds_apm --version ${{ steps.build.outputs.gem_version }}
           ruby ./scripts/test_install.rb
 
+      - name: Now also check manually if there is a trace for service 'ruby-post-release-test' in SW production
+        run: echo "TODO"
+
+      - name: And now the release notes need to be completed for the new release
+        run: echo "TODO"
 

data/.github/workflows/build_for_packagecloud.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install gems
         run: |
           echo 'gem: --no-document' >> ~/.gemrc
-          bundle install --without development --without test
+          bundle install
 
       - name: Install swig 4.0.2
         run: |
@@ -32,26 +32,15 @@ jobs:
           ./autogen.sh && ./configure && make && sudo make install
           cd -
 
-      - name: Download oboe staging files from S3, compile swig wrapper
+      - name: Grab current version
+        id: version
         run: |
-          bundle exec rake fetch
-          ls -l ext/oboe_metal/src
+          echo ::set-output name=gem_version::`ruby -e 'require "./lib/solarwinds_apm/version"; puts SolarWindsAPM::Version::STRING'`
 
-      - name: Build Gem
+      - name: Build gem and publish to packagecloud
         id: gemstep
         run:  |
-          gem build solarwinds_apm.gemspec
-          echo `shasum -a256 *.gem`
-          echo "::set-output name=GEM_VERSION::`ruby -e 'require "./lib/solarwinds_apm/version"; puts SolarWindsAPM::Version::STRING'`"
-          cat ext/oboe_metal/src/VERSION
-
-      - name: Publish to PackageCloud
-        # PackageCloud is unreliable with regards to
-        # republishing after yanking a gem
-        # we are going to fail if republishing is attempted
-        run: |
-          gem install package_cloud
-          package_cloud push solarwinds/solarwinds-apm-ruby *.gem
+          bundle exec rake build_gem_push_to_packagecloud[${{ steps.version.outputs.gem_version }}]
         env:
           PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
 
@@ -62,7 +51,7 @@ jobs:
 #        env:
 #          SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }}
 #          SW_APM_COLLECTOR: ${{ secrets.SW_APM_COLLECTOR}}
-#          OBOE_FROM_S3: true
+#          OBOE_STAGING: true
 #        run: |
 #          sleep 60
 #          gem sources --add https://packagecloud.io/solarwinds/solarwinds-apm-ruby

data/.github/workflows/docker-images.yml

@@ -8,7 +8,8 @@ on:
   workflow_dispatch:
 
 env:
-  GHRC: ghcr.io/appoptics/appoptics-apm-ruby/apm_ruby
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}/apm_ruby
   DOCKERFILE: test/run_tests/Dockerfile
 
 jobs:
@@ -23,25 +24,30 @@ jobs:
         os: [ubuntu, debian, centos, alpine]
 
     steps:
-    - name: Checkout
+    - name: Checkout ${{ github.ref }}
       uses: actions/checkout@v1
 
-    - name: ghcr.io login
-      uses: docker/login-action@v1
+    - name: Log in to the Container Registry
+      uses: docker/login-action@v2
       with:
-        registry: ghcr.io
+        registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+        
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_${{ matrix.os }}
+        flavor: |
+          latest=true
 
-#    - name: Build and push V2
-#      uses: docker/build-push-action@v2
-#      with:
-#        file: test/run_tests/Dockerfile_ubuntu
-#        tags: ghcr.io/appoptics/appoptics-apm-ruby/ao_ubuntu:latest
-#        push: true
-
-    - name: Build new Docker image
-      run: docker build -f ${{ env.DOCKERFILE }}_${{ matrix.os }} -t ${{ env.GHRC }}_${{ matrix.os }} .
-
-    - name: Publish updated Docker image
-      run: docker push ${{ env.GHRC }}_${{ matrix.os }}
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: true
+        file: test/run_tests/Dockerfile_${{ matrix.os }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        

data/.github/workflows/run_cpluplus_tests.yml

@@ -29,7 +29,7 @@ jobs:
       SW_APM_REPORTER: file
       SW_APM_COLLECTOR: /tmp/sw_apm_traces.bson
       SW_APM_REPORTER_FILE_SINGLE: false
-      OBOE_FROM_S3: true
+      OBOE_STAGING: true
 
     steps:
       - uses: actions/checkout@v2

data/.github/workflows/run_tests.yml

@@ -23,7 +23,6 @@ jobs:
           - frameworks
           - rails70
           - rails61
-          - rails60
           - rails52
           - delayed_job
           - noop
@@ -64,7 +63,7 @@ jobs:
       SW_APM_REPORTER: file
       SW_APM_COLLECTOR: /tmp/sw_apm_traces.bson
       SW_APM_REPORTER_FILE_SINGLE: false
-      OBOE_FROM_S3: true
+      OBOE_STAGING: true
       MONGO_SERVER: "mongo"
       RABBITMQ_SERVER: "rabbitmq"
       MEMCACHED_SERVER: "memcached"
@@ -94,11 +93,12 @@ jobs:
         image: mongo:latest
         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:10.8
+        image: postgres:latest
         env:
-          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: test_db
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -129,7 +129,6 @@ jobs:
 
       - name: Initialize services
         run: |
-          export PGPASSWORD=$POSTGRES_PASSWORD; psql -c 'create database test_db;' -U postgres -h $POSTGRES_HOST
           curl -SL http://download.redis.io/releases/redis-4.0.0.tar.gz | tar xzC /tmp && cd /tmp/redis-4.0.0/ && make && make install && cd -
           redis-server --requirepass redis_pass --loglevel "warning" &
 

data/.github/workflows/scripts/test_install.rb

@@ -8,16 +8,21 @@
 # - SW_APM_COLLECTOR (optional if the key is for production)
 
 require 'solarwinds_apm'
+
+unless SolarWindsAPM::SDK.solarwinds_ready?(10_000)
+  puts "aborting!!! Agent not ready after 10 seconds"
+  exit false
+end
+
+op = lambda { 10.times {[9, 6, 12, 2, 7, 1, 9, 3, 4, 14, 5, 8].sort} }
+
 SolarWindsAPM.support_report
-exit 1 unless SolarWindsAPM.reporter
 
-SolarWindsAPM::Config[:profiling] = :enabled
+# no profiling yet for NH, but it shouldn't choke on Profiling.run
+SolarWindsAPM::Config[:profiling] = :disabled
 
-SolarWindsAPM::SDK.start_trace("install_test_profiling") do
-  SolarWindsAPM::Profiling.run do
-    10.times do
-      [9, 6, 12, 2, 7, 1, 9, 3, 4, 14, 5, 8].sort
-      sleep 0.2
-    end
-  end
+SolarWindsAPM::SDK.start_trace("ruby_post_release_test") do
+  SolarWindsAPM::Profiling.run { op.call } if defined?(SolarWindsAPM::Profiling)
+  op.call unless defined?(SolarWindsAPM::Profiling)
+  puts "Looks good!"
 end

data/.github/workflows/test_on_4_linux.yml

@@ -7,7 +7,7 @@ on:
   push:
     paths-ignore:
       - 'test/run_tests/Dockerfile_*'
-# Allows you to run this workflow manually from the Actions tab
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 env:
@@ -85,7 +85,7 @@ jobs:
       SW_APM_REPORTER: file
       SW_APM_COLLECTOR: /tmp/sw_apm_traces.bson
       SW_APM_REPORTER_FILE_SINGLE: false
-      OBOE_FROM_S3: true
+      OBOE_STAGING: true
       MONGO_SERVER: "mongo"
       RABBITMQ_SERVER: "rabbitmq"
       MEMCACHED_SERVER: "memcached"
@@ -115,7 +115,7 @@ jobs:
           - 5672:5672
         options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
       mongo:
-        image: mongo:latest
+        image: mongo:5
         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"

data/.gitignore

@@ -4,12 +4,14 @@
 *.log
 *.swp
 *~
+*.rdb
 .*byebug*
 .bundle/
 .env
 .irb_history
 .irbrc
 .ruby-version
+dump.rdb
 .trusted_paths/
 .yardoc/
 /app/
@@ -26,14 +28,16 @@ ext/oboe_metal/oboe_noop.so
 ext/oboe_metal/src/bson/
 ext/oboe_metal/src/oboe_api.cpp
 ext/oboe_metal/src/oboe.h
-ext/oboe_metal/src/oboe_api.hpp
+ext/oboe_metal/src/oboe_api.h
 ext/oboe_metal/src/oboe_debug.h
 ext/oboe_metal/src/oboe_swig_wrap.cc
 ext/oboe_metal/src/VERSION_latest
 ext/oboe_metal/test/build/
 ext/oboe_metal/test/MakeFile
+ext/oboe_metal/.DS_Store
 gemfiles/*.lock
 gemfiles/.bundle/
 gemfiles/vendor*
 lib/libsolarwinds_apm.so
 vendor/
+

data/.whitesource

@@ -0,0 +1,22 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken": "",
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff",
+    "useMendCheckNames": true
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW",
+    "issueType": "DEPENDENCY"
+  },
+  "remediateSettings": {
+    "workflowRules": {
+      "enabled": true
+    }
+  }
+}