NH-66480: remove packagecloud and downgrade graphql version

.github/codeql/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'test/**/*.rb'

.github/workflows/build_for_github_package.yml

@@ -0,0 +1,49 @@
+# Copyright (c) 2023 SolarWinds, LLC.
+# All rights reserved.
+
+name: Ruby Gem to Github Package
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build + Publish to Github Package
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Ruby 2.7 and bundle
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+
+      - name: Install gems
+        run: |
+          echo 'gem: --no-document' >> ~/.gemrc
+          bundle install
+
+      - name: Install swig 4.0.2
+        run: |
+          apt udate && apt install -y --no-install-recommends bison
+          curl -SL https://github.com/swig/swig/archive/refs/tags/v4.0.2.tar.gz | tar xzC /tmp
+          cd /tmp/swig-4.0.2
+          ./autogen.sh && ./configure && make && sudo make install
+          cd -
+
+      - name: Grab current version
+        id: version
+        run: |
+          echo "gem_version=`ruby -e 'require "./lib/solarwinds_apm/version"; puts SolarWindsAPM::Version::STRING'`" >> $GITHUB_OUTPUT
+
+      - name: Build gem and publish to github package
+        id: gemstep
+        run:  |
+          mkdir ~/.gem
+          echo -e "---\n:github: Bearer $GITHUB_SECRET_TOKEN" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+          bundle exec rake build_gem_for_github_package[${{ steps.version.outputs.gem_version }}]
+          bundle exec rake push_gem_to_github_package[${{ steps.version.outputs.gem_version }}]
+        env:
+          GITHUB_SECRET_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/codeql_analysis.yml → .github/workflows/codeql_analysis.yml

@@ -31,11 +31,12 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           queries: security-extended,security-and-quality
+          config-file: ./.github/codeql/codeql-config.yml
 
       - name: Autobuild
         uses: github/codeql-action/autobuild@v2

.github/workflows/docker-images.yml

@@ -31,7 +31,7 @@ jobs:
       uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Log in to the Container Registry
       uses: docker/login-action@v2
@@ -42,7 +42,7 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker (both ARM and AMD64)
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_${{ matrix.os }} # e.g. apm_ruby_ubuntu
         flavor: |

.github/workflows/scripts/_helper_run_install_tests.sh

@@ -34,9 +34,22 @@ rbenv local $RUBY_VERSION
 if [ "$MODE" = "RubyGem" ]; then
     echo "RubyGem"
     gem install solarwinds_apm -v "$SOLARWINDS_APM_VERSION"
-elif [ "$MODE" = "packagecloud" ]; then
-    echo "packagecloud"
-    gem install solarwinds_apm -v "$SOLARWINDS_APM_VERSION" --source https://packagecloud.io/solarwinds/solarwinds-apm-ruby/
+    ruby ./home/.github/workflows/scripts/test_install.rb
+elif [ "$MODE" = "GitHub" ]; then
+    echo "GitHub"
+    VERSION_LOWER_CASE=$(echo "$SOLARWINDS_APM_VERSION" | tr '[:upper:]' '[:lower:]')
+    echo "source 'https://rubygems.org'" >> Gemfile
+    echo "source 'https://rubygems.pkg.github.com/solarwinds' do" >> Gemfile
+    echo "  gem 'solarwinds_apm', '${VERSION_LOWER_CASE}'" >> Gemfile
+    echo "end" >> Gemfile
+    gem install bundler
+    bundle install
+    bundle exec ruby ./home/.github/workflows/scripts/test_install.rb
 fi
 
-ruby ./home/.github/workflows/scripts/test_install.rb
+if [ $? -ne 0 ]; then
+  echo "Problem encountered"
+  exit 1
+fi
+
+exit 0

.github/workflows/verify_install.yml

@@ -5,12 +5,12 @@ on:
     inputs:
       install-registry:
         required: true
-        description: 'Registry used for install tests, e.g. RubyGem, packagecloud'
+        description: 'Registry used for install tests, e.g. RubyGem, GitHub'
         type: choice
         default: 'RubyGem'
         options:
         - RubyGem
-        - packagecloud
+        - GitHub
 
       solarwinds-version:
         required: true
@@ -46,7 +46,7 @@ jobs:
             -e SW_APM_SERVICE_KEY=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \
             -e SW_APM_COLLECTOR=${{ secrets.SW_APM_COLLECTOR_PROD }} \
             -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
-            -e PACKAGECLOUD_TOKEN=${{ secrets.PACKAGECLOUD_TOKEN }} \
+            -e BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${{ secrets.GITHUB_TOKEN }} \
             -e MODE=${{ github.event.inputs.install-registry }} \
             -e RUBY_VERSION=${{ matrix.ruby_version }} \
             -v $(pwd):/home \
@@ -84,7 +84,7 @@ jobs:
             -e SW_APM_SERVICE_KEY=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \
             -e SW_APM_COLLECTOR=${{ secrets.SW_APM_COLLECTOR_PROD }} \
             -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
-            -e PACKAGECLOUD_TOKEN=${{ secrets.PACKAGECLOUD_TOKEN }} \
+            -e BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${{ secrets.GITHUB_TOKEN }} \
             -e MODE=${{ github.event.inputs.install-registry }} \
             -e RUBY_VERSION=${{ matrix.ruby_version }} \
             -v $(pwd):/home \
@@ -111,7 +111,7 @@ jobs:
             -e SW_APM_SERVICE_KEY=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \
             -e SW_APM_COLLECTOR=${{ secrets.SW_APM_COLLECTOR_PROD }} \
             -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
-            -e PACKAGECLOUD_TOKEN=${{ secrets.PACKAGECLOUD_TOKEN }} \
+            -e BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${{ secrets.GITHUB_TOKEN }} \
             -e MODE=${{ github.event.inputs.install-registry }} \
             -v $(pwd):/home \
             --rm redhat/ubi8 \
@@ -138,7 +138,7 @@ jobs:
             -e SW_APM_SERVICE_KEY=${{ secrets.SW_APM_SERVICE_KEY_PROD }} \
             -e SW_APM_COLLECTOR=${{ secrets.SW_APM_COLLECTOR_PROD }} \
             -e SOLARWINDS_APM_VERSION=${{ github.event.inputs.solarwinds-version }} \
-            -e PACKAGECLOUD_TOKEN=${{ secrets.PACKAGECLOUD_TOKEN }} \
+            -e BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${{ secrets.GITHUB_TOKEN }} \
             -e MODE=${{ github.event.inputs.install-registry }} \
             -v $(pwd):/home \
             --rm redhat/ubi8 \

Gemfile

@@ -9,7 +9,6 @@ group :development, :test do
   gem 'byebug', '>= 8.0.0'
   gem 'irb', '>= 1.0.0' # if RUBY_VERSION >= '2.6.0'
   gem 'memory_profiler'
-  gem 'package_cloud'
 end
 
 gemspec

Rakefile

@@ -393,36 +393,37 @@ task :build_gem do
   puts "\n=== Finished ===\n"
 end
 
-desc "Build gem and push to packagecloud. Run as bundle exec rake build_gem_push_to_packagecloud[<version>]"
-task :build_gem_push_to_packagecloud, [:version] do |t, args|
+def find_or_build_gem(version)
+  abort('No version specified.') if version.to_s.empty?
 
-  require 'package_cloud'
-
-  puts "\n=== Ready to push solarwinds_apm #{args[:version]} ===\n"
-
-  abort("Require PACKAGECLOUD_TOKEN\n See here: https://packagecloud.io/docs ") if ENV["PACKAGECLOUD_TOKEN"]&.empty? || ENV["PACKAGECLOUD_TOKEN"].nil?
-  abort("No version specified.") if args[:version]&.empty? || args[:version].nil?
-
-  gems = Dir["builds/solarwinds_apm-#{args[:version]}.gem"]
+  gems = Dir["builds/solarwinds_apm-#{version}.gem"]
   gem_to_push = nil
-  if gems.size == 0
-    Rake::Task["build_gem"].execute 
+  if gems.empty?
+    Rake::Task['build_gem'].execute
     gem_to_push = `ls -dt1 builds/solarwinds_apm-[^pre]*.gem | head -1`
   else
     gem_to_push = gems.first
   end
 
-  puts "\n=== Gem will be pushed #{gem_to_push} ===\n"
-  gem_to_push_version = gem_to_push&.match(/-\d*.\d*.\d*/).to_s.gsub("-","")
-  gem_to_push_version = gem_to_push&.match(/-\d*.\d*.\d*.\d*pre/).to_s.gsub("-","") if args[:version].include? "pre"
-  puts "\n=== gem_to_push_version: #{gem_to_push_version} ===\n"
-
-  abort("Couldn't find the required gem file.") if gem_to_push.nil? || gem_to_push_version != args[:version]
-
-  cli = PackageCloud::CLI::Entry.new
-  cli.push("solarwinds/solarwinds-apm-ruby", gem_to_push.strip())
+  puts "\n=== Gem will be pushed #{gem_to_push} ==="
+  gem_to_push_version = gem_to_push&.match(/-\d*.\d*.\d*/).to_s.delete!('-')
+  gem_to_push_version = gem_to_push&.match(/-\d*.\d*.\d*.prev[0-9]*/).to_s.delete!('-') if version.include? 'prev'
 
-  puts "\n=== Finished ===\n"
+  abort('Could not find the required gem file.') if gem_to_push.nil? || gem_to_push_version != version
 
+  gem_to_push
 end
 
+# need set the credentials under ~/.gem/credentials
+# for download, easiest way is to set BUNDLE_RUBYGEMS__PKG__GITHUB__COM
+# but there are other auth methods. see more on https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry
+desc 'Push to github package. Run as bundle exec rake build_gem_push_to_github_package[<version>]'
+task :push_gem_to_github_package, [:version] do |_, args|
+  exit 1 unless system('gem', 'push', '--key', 'github', '--host', 'https://rubygems.pkg.github.com/solarwinds', "builds/solarwinds_apm-#{args[:version]}.gem")
+  puts "\n=== Finished ===\n"
+end
+
+desc 'Build gem for github package'
+task :build_gem_for_github_package, [:version] do |_, args|
+  find_or_build_gem(args[:version])
+end

gemfiles/libraries.gemfile

@@ -40,7 +40,7 @@ gem 'faraday', '~> 1.0'
 if RUBY_VERSION < '2.7'
   gem 'graphql', '< 1.13.0'
 else
-  gem 'graphql'
+  gem 'graphql', '2.1.1'
 end
 gem 'httpclient'
 gem 'logging'
@@ -61,7 +61,6 @@ gem 'typhoeus'
 # Database adapter gems needed by sequel
 gem 'mysql2'
 gem 'pg'
-gem 'package_cloud'
 
 eval(File.read(File.join(File.dirname(__FILE__), 'test_gems.gemfile')))
 

gemfiles/noop.gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 if RUBY_VERSION < '2.6'
   gem 'graphql', '< 1.13.0'
 else
-  gem 'graphql'
+  gem 'graphql', '< 2.1.1'
 end
 
 eval(File.read(File.join(File.dirname(__FILE__), 'test_gems.gemfile')))

gemfiles/redis.gemfile

@@ -18,7 +18,6 @@ gem 'typhoeus'
 # Database adapter gems needed by sequel
 gem 'mysql2'
 gem 'pg'
-gem 'package_cloud'
 
 eval(File.read(File.join(File.dirname(__FILE__), 'test_gems.gemfile')))
 

lib/solarwinds_apm/config.rb

@@ -287,7 +287,7 @@ def self.[]=(key, value)
     def self.method_missing(sym, *args)
       class_var_name = "@@#{sym}"
 
-      if sym.to_s =~ /(.+)=$/
+      if sym.to_s =~ /\A(.{1,20})=\z/
         self[$1] = args.first
       else
         # Try part of the @@config hash first

lib/solarwinds_apm/inst/graphql.rb

@@ -21,6 +21,7 @@ class SolarWindsAPMTracing < GraphQL::Tracing::PlatformTracing
         # These GraphQL events will show up as 'graphql.prep' spans
         PREP_KEYS = ['lex', 'parse', 'validate', 'analyze_query', 'analyze_multiplex'].freeze
         EXEC_KEYS = ['execute_multiplex', 'execute_query', 'execute_query_lazy'].freeze
+        MAX_QUERY_LENGTH = 1000
 
         self.platform_keys = {
           'lex' => 'lex',
@@ -150,7 +151,10 @@ def graphql_multiplex(data)
 
         def sanitize(query)
           return unless query
-
+          if query.length > MAX_QUERY_LENGTH
+            SolarWindsAPM.logger.warn '[solarwinds_apm/graphql] query is too long for sanitizing. Return empty query string.'
+            return ''
+          end
           # remove arguments
           query.gsub(/"[^"]*"/, '"?"')                 # strings
                .gsub(/-?[0-9]*\.?[0-9]+e?[0-9]*/, '?') # ints + floats

lib/solarwinds_apm/loading.rb

@@ -4,29 +4,6 @@
 require 'digest/sha1'
 
 module SolarWindsAPM
-  module Util
-    ##
-    # This module was used solely for the deprecated RUM ID calculation
-    # but may be useful in the future.
-    #
-    module Base64URL
-      module_function
-
-      def encode(bin)
-        c = [bin].pack('m0').gsub(/\=+\Z/, '').tr('+/', '-_').rstrip
-        m = c.size % 4
-        c += '=' * (4 - m) if m != 0
-        c
-      end
-
-      def decode(bin)
-        m = bin.size % 4
-        bin += '=' * (4 - m) if m != 0
-        bin.tr('-_', '+/').unpack('m0').first
-      end
-    end
-  end
-
   ##
   # This module houses all of the loading functionality for the solarwinds_apm em.