merge

Author: xuan-cao-swi

.github/workflows/build_and_release_gem.yml

@@ -18,6 +18,9 @@ jobs:
     name: Build + Release Gem to RubyGems
     runs-on: ubuntu-latest
 
+    outputs:
+      apm_ruby_version: ${{ steps.build.outputs.gem_version }}
+
     steps:
       - uses: actions/checkout@v4
 
@@ -82,6 +85,12 @@ jobs:
               draft: true
             })
 
+      - name: Upload to artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: solarwinds_apm-${{ steps.build.outputs.gem_version }}.gem
+          path: solarwinds_apm-${{ steps.build.outputs.gem_version }}.gem
+
       # 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/
@@ -92,3 +101,43 @@ jobs:
           sudo apt-get update && sudo apt-get install -y ruby-dev g++ make
           gem install solarwinds_apm --version ${{ steps.build.outputs.gem_version }}
           ruby ./scripts/test_install.rb
+
+  # extract the built layer from artifacts, then scan it with reverselab
+  reverselab_scan_gem:
+    needs:
+      - publish_to_ruby_gem
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: extract layer zip from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: solarwinds_apm-${{ env.SOLARWINDS_APM_VERSION }}.gem
+          path: ./
+        env:
+          SOLARWINDS_APM_VERSION: ${{needs.publish_to_ruby_gem.outputs.apm_ruby_version}}
+
+      - name: Scan build artifact on the Portal
+        id: rl-scan
+        env:
+          RLPORTAL_ACCESS_TOKEN: ${{ secrets.REVERSE_LAB_TOKEN }}
+        uses: reversinglabs/gh-action-rl-scanner-cloud-only@v1
+        with:
+          artifact-to-scan: ./solarwinds_apm-${{ steps.SOLARWINDS_APM_VERSION }}.gem
+          rl-verbose: true
+          rl-portal-server: solarwinds
+          rl-portal-org: SolarWinds
+          rl-portal-group: SaaS-Agents-SWO
+          rl-package-url: solarwinds-apm-ruby/apm-ruby-prod@${{ env.SOLARWINDS_APM_VERSION }}
+        env:
+          SOLARWINDS_APM_VERSION: ${{needs.publish_to_ruby_gem.outputs.apm_ruby_version}}
+
+      - name: report the scan status
+        if: success() || failure()
+        run: |
+          echo "The status is: '${{ steps.rl-scan.outputs.status }}'"
+          echo "The description is: '${{ steps.rl-scan.outputs.description }}'"

.github/workflows/build_for_github_package.yml

@@ -7,10 +7,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  publish_to_github_package:
     name: Build + Publish to Github Package
     runs-on: ubuntu-latest
 
+    outputs:
+      apm_ruby_version: ${{ steps.version.outputs.gem_version }}
+
     steps:
       - uses: actions/checkout@v4
 
@@ -47,3 +50,49 @@ jobs:
           bundle exec rake push_gem_to_github_package[${{ steps.version.outputs.gem_version }}]
         env:
           GITHUB_SECRET_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload to artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: solarwinds_apm-${{ steps.version.outputs.gem_version }}.gem
+          path: builds/solarwinds_apm-${{ steps.version.outputs.gem_version }}.gem
+
+  # extract the built layer from artifacts, then scan it with reverselab
+  reverselab_scan_gem:
+    needs:
+      - publish_to_github_package
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: extract layer zip from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: solarwinds_apm-${{ env.SOLARWINDS_APM_VERSION }}.gem
+          path: builds
+        env:
+          SOLARWINDS_APM_VERSION: ${{needs.publish_to_github_package.outputs.apm_ruby_version}}
+
+      - name: Scan build artifact on the Portal
+        id: rl-scan
+        env:
+          RLPORTAL_ACCESS_TOKEN: ${{ secrets.REVERSE_LAB_TOKEN }}
+        uses: reversinglabs/gh-action-rl-scanner-cloud-only@v1
+        with:
+          artifact-to-scan: builds/solarwinds_apm-${{ env.SOLARWINDS_APM_VERSION }}.gem
+          rl-verbose: true
+          rl-portal-server: solarwinds
+          rl-portal-org: SolarWinds
+          rl-portal-group: SaaS-Agents-SWO
+          rl-package-url: solarwinds-apm-ruby/apm-ruby-stg@${{ env.SOLARWINDS_APM_VERSION }}
+        env:
+          SOLARWINDS_APM_VERSION: ${{needs.publish_to_github_package.outputs.apm_ruby_version}}
+
+      - name: report the scan status
+        if: success() || failure()
+        run: |
+          echo "The status is: '${{ steps.rl-scan.outputs.status }}'"
+          echo "The description is: '${{ steps.rl-scan.outputs.description }}'"

CHANGELOG.md

@@ -5,6 +5,21 @@ For the latest release info, see here:
 
 Dates in this file are in the format MM/DD/YYYY.
 
+## solarwinds_apm 6.1.2 (02/28/2025)
+
+This release includes the following features:
+
+* `add_tracer` helper function for custom instrumentation on specific function
+* Added dbo integration for PostgreSQL (without prepared statement)
+
+## solarwinds_apm 6.1.1 (12/09/2024)
+
+This release includes the following features:
+
+* Mysql2 sqlcommenting for DBO integration
+* Removed the marginalia support on query commenting
+* Added the support of after fork on forked process
+
 ## solarwinds_apm 6.1.0 (09/18/2024)
 
 This release includes the following features:

CONFIGURATION.md

@@ -168,16 +168,7 @@ SELECT * FROM SAMPLE_TABLE WHERE user_id = 1; /* traceparent=7435a9fe510ae453341
 #### Limitation
 
 > [!NOTE]  
-> This feature currently does not support prepared statements. Active Record by default enables prepared statements for the PostgreSQL adapter (`postgresql`), to use this feature you can explicitly disable it as shown below. Please evaluate the impact of disabling prepared statements on your system before proceeding.
-
-e.g.
-
-```yaml
-development:
-  adapter: postgresql
-  # ...
-  prepared_statements: false
-```
+> This feature currently does not support prepared statements. For `mysql2` the `query` operation is supported, for `pg` the "[exec-ish](https://github.com/solarwinds/apm-ruby/blob/main/lib/solarwinds_apm/patch/tag_sql/sw_pg_patch.rb#L15)" operations like `exec` and `query` are supported.
 
 ### Background Jobs
 

README.md

@@ -89,6 +89,7 @@ add_tracer :method_name, 'custom_span_name', { attributes: { 'any' => 'attribute
 For example, if you want to instrument class or instance method `create_session` inside an application controller:
 
 To instrument instance method
+
 ```ruby
 class SessionsController < ApplicationController
   include SolarWindsAPM::API::Tracer
@@ -107,6 +108,7 @@ end
 ```
 
 To instrument class method
+
 ```ruby
 class SessionsController < ApplicationController
   def create

Rakefile

@@ -32,7 +32,8 @@ Rake::TestTask.new do |t|
                    FileList['test/noop/*_test.rb'] +
                    FileList['test/ext/*_test.rb'] +
                    FileList['test/support/*_test.rb'] +
-                   FileList['test/sampling/*_test.rb']
+                   FileList['test/sampling/*_test.rb'] +
+                   FileList['test/support/resource_detector/aws/*_test.rb']
   end
 end
 
@@ -298,12 +299,13 @@ task :build_gem do
   gemname = Dir['solarwinds_apm*.gem'].first
   FileUtils.mv(gemname, 'builds/')
 
+  built_gem = Dir['builds/solarwinds_apm*.gem']
+
   puts "\n=== last 5 built gems ===\n"
-  puts Dir['builds/solarwinds_apm*.gem']
+  puts built_gem
 
   puts "\n=== SHA256 ===\n"
-  result = `ls -dt1 builds/solarwinds_apm-[^pre]*.gem | head -1`
-  system("shasum -a256 #{result.strip}")
+  system("shasum -a256 #{built_gem.first}")
 
   puts "\n=== Finished ===\n"
 end
@@ -315,7 +317,7 @@ def find_or_build_gem(version)
   gem_to_push = nil
   if gems.empty?
     Rake::Task['build_gem'].execute
-    gem_to_push = `ls -dt1 builds/solarwinds_apm-[^pre]*.gem | head -1`
+    gem_to_push = Dir['builds/solarwinds_apm*.gem'].first
   else
     gem_to_push = gems.first
   end

ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-15.0.3
+16.0.0

gemfiles/test_gems.gemfile

@@ -40,4 +40,8 @@ group :development, :test do
   gem 'opentelemetry-metrics-sdk'
   gem 'opentelemetry-exporter-otlp-metrics'
   gem 'opentelemetry-test-helpers'
+
+  gem 'opentelemetry-resource-detector-azure'
+  gem 'opentelemetry-resource-detector-container'
+  gem 'opentelemetry-resource-detector-google_cloud_platform'
 end

lambda/otel/layer/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 # source 'https://rubygems.pkg.github.com/solarwinds' do
 # end
 
-gem 'opentelemetry-exporter-otlp', '0.29.1'
-gem 'opentelemetry-exporter-otlp-metrics', '0.2.1'
-gem 'solarwinds_apm', '6.1.1'
+gem 'opentelemetry-api', '1.4.0'
+gem 'opentelemetry-exporter-otlp', '0.30.0'
+gem 'opentelemetry-exporter-otlp-metrics', '0.4.0'
+gem 'solarwinds_apm', '6.1.2'