appoptics_apm 4.12.2 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d965e8566e484600d93a0464d8421bef1f6b578eeb831462ced9b1bd28a99561
-  data.tar.gz: 4b06e0e2e9eb0e3c7f329286a28376ddbfa906d06ac074aa73abfb3f0fa66305
+  metadata.gz: 6f8521d6d7683aaef83d35504c4875191ca2340bb5fea0c16ce40dd6f4704465
+  data.tar.gz: f134e9eea6744e5238422c5a27f75687bc5d8aadf370e2e5588814b8f8a9e3a3
 SHA512:
-  metadata.gz: 3173787156f779575df425cc0fd8b855833d97bb05b9f00aa6d6bdedd74c4ca8028a274009822441666fc9d6e1b20b8822887d1034d38625e4e5a33361190b86
-  data.tar.gz: fbfcf3540014922155bdfd0865ef09ff316635580d50403b48d07a9a089aa0123e54eff62eb316c084750084faeef9ae8260eea3ef04885a113bacb3ecd1c71e
+  metadata.gz: a6a932fb422ab7277cd04debfb8927d1ca98a74a9743055925bdd2161f8be194af9b5aefb8ad7d198d5746622ad471639fb10cdcf29678054361e1db3a292d0f
+  data.tar.gz: 6796ae6f652917845031b56107c7859a2a443b1da5bc8820d183d415eb14781c5809dfdbe22dc5da7adac109321918a4197b5dd4b5e96ea3be5dd23d85198cf3

data/.github/workflows/build_and_release_gem.yml

@@ -0,0 +1,103 @@
+# Copyright (c) 2021 SolarWinds, LLC.
+# All rights reserved.
+
+name: BUILD, VERIFY, and RELEASE Ruby Gem to RubyGems
+
+# This workflow relies on the following secrets
+# - TRACE_BUILD_RUBY_ACTIONS_API_TOKEN (from the trace-build user in github)
+# - RUBYGEMS_TOKEN (from the appoptics user on rubygems.org)
+# - APPOPTICS_SERVICE_KEY
+# - APPOPTICS_COLLECTOR
+#
+# The correct oboe version has to be in the file ext/oboe_metal/src/VERSION
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build + Release Gem to RubyGems
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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 --without development --without test
+
+      - 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: Download files from files.appoptics.com and create swig wrapper
+        env:
+          TRACE_BUILD_TOKEN: ${{ secrets.TRACE_BUILD_RUBY_ACTIONS_API_TOKEN }}
+        run: |
+          bundle exec rake oboe_files_appoptics_fetch
+          bundle exec rake oboe_verify
+
+      - name: Build Gem and upload to Rubygems
+        id: build
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_TOKEN }}
+        run:  |
+          bundle exec rake build_and_publish_gem
+          checksum=`shasum -a256 *.gem | awk '{print $1;}'`
+          echo "checksum: $checksum"
+          echo ::set-output name=checksum::$checksum
+          echo ::set-output name=gem_version::`ruby -e 'require "./lib/appoptics_apm/version"; puts AppOpticsAPM::Version::STRING'`
+
+      - name: Get checksum from Rubygems
+        id: checksum
+        run: |
+          gem_version=${{ steps.build.outputs.gem_version }}
+          echo ::set-output name=geminfo::`curl https://rubygems.org/api/v2/rubygems/appoptics_apm/versions/$gem_version.json`
+
+      - name: Print checksums (in case some debugging is needed)
+        run: |
+          echo "local checksum:    ${{ steps.build.outputs.checksum }}"
+          echo "Rubygems checksum: ${{ fromJson(steps.checksum.outputs.geminfo).sha }}"
+
+      - name: Fail if local and rubygems checksums don't match
+        if: fromJson(steps.checksum.outputs.geminfo).sha != steps.build.outputs.checksum
+        run: |
+          echo "local and rubygems checksum not matching, gem needs to be yanked from rubygems.org"
+          exit 1
+
+      - name: Create release draft that includes the checksum
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.repos.createRelease({
+              owner: "appoptics",
+              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
+            })
+
+      # 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:
+          APPOPTICS_SERVICE_KEY: ${{ secrets.APPOPTICS_SERVICE_KEY }}
+          APPOPTICS_COLLECTOR: ${{ secrets.APPOPTICS_COLLECTOR}}
+        run: |
+          sleep 1
+          gem install appoptics_apm --version ${{ steps.build.outputs.gem_version }}
+          ruby ./scripts/test_install.rb
+
+

data/.github/workflows/build_for_packagecloud.yml

@@ -0,0 +1,70 @@
+# Copyright (c) 2021 SolarWinds, LLC.
+# All rights reserved.
+
+name: Ruby Gem to PackageCloud
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build + Publish to PackageCloud
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby 2.6 and bundle
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
+      - name: Install gems
+        run: |
+          echo 'gem: --no-document' >> ~/.gemrc
+          bundle install --without development --without test
+
+      - 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: Download oboe staging files from S3, compile swig wrapper
+        run: |
+          bundle exec rake fetch
+          ls -l ext/oboe_metal/src
+
+      - name: Build Gem
+        id: gemstep
+        run:  |
+          gem build appoptics_apm.gemspec
+          echo `shasum -a256 *.gem`
+          echo "::set-output name=GEM_VERSION::`ruby -e 'require "./lib/appoptics_apm/version"; puts AppOpticsAPM::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/appoptics-apm-ruby *.gem
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+# Run this test manually, github is having problems reading the index at packagecloud
+# TODO: AO-20355
+#      - name: Test install (give packagecloud 60 seconds to index)
+#        working-directory: .github/workflows/
+#        env:
+#          APPOPTICS_SERVICE_KEY: ${{ secrets.APPOPTICS_SERVICE_KEY }}
+#          APPOPTICS_COLLECTOR: ${{ secrets.APPOPTICS_COLLECTOR}}
+#          APPOPTICS_FROM_S3: true
+#        run: |
+#          sleep 60
+#          gem sources --add https://packagecloud.io/solarwinds/appoptics-apm-ruby
+#          gem install appoptics_apm --version ${{ steps.gemstep.outputs.GEM_VERSION }} --verbose
+#          ruby ./scripts/test_install.rb

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

@@ -0,0 +1,47 @@
+name: Build docker images
+
+on:
+  push:
+    paths:
+    - 'test/run_tests/Dockerfile_*'
+  # Allows running 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:
+
+  build_push:
+    name: Build docker images
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, debian, centos, alpine]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: ghcr.io login
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+#    - 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 }}

data/.github/workflows/run_cpluplus_tests.yml

@@ -0,0 +1,73 @@
+# Copyright (c) 2021 SolarWinds, LLC.
+# All rights reserved.
+
+name: C++ Tests
+
+on:
+  push:
+    paths:
+      - ext/oboe_metal/src/*.h
+      - ext/oboe_metal/src/*.cc
+      - ext/oboe_metal/test/*
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [3.0, 2.7, 2.6, 2.5, 2.4]
+
+    container:
+      image: ruby:${{ matrix.ruby }}
+
+    name: ${{ matrix.ruby }} - c++
+
+    env:
+      APPOPTICS_REPORTER: file
+      APPOPTICS_COLLECTOR: /tmp/appoptics_traces.bson
+      APPOPTICS_REPORTER_FILE_SINGLE: false
+      APPOPTICS_FROM_S3: true
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install cmake
+        run: |
+          ls -lrt /usr/src
+          apt update && apt install -y --no-install-recommends build-essential libgtest-dev ruby
+          curl -OL  https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-SHA-256.txt
+          curl -OL https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5.tar.gz
+          sha256sum -c --ignore-missing cmake-3.20.5-SHA-256.txt
+          tar -zxvf cmake-3.20.5.tar.gz
+          cd cmake-3.20.5
+          ./bootstrap
+          make
+          make install
+
+      - name: Install swig 4.0.2
+        working-directory: .github/workflows/swig
+        run: |
+          apt update && apt install -y --no-install-recommends bison
+          tar -xf swig-v4.0.2.tar.gz -C /tmp
+          cd /tmp/swig-4.0.2
+          ./autogen.sh && ./configure && make && make install
+          cd -
+
+      - name: Bundle & download c-files
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rake clean fetch compile
+
+      - name: Compile and run tests
+        working-directory: ext/oboe_metal/test
+        run: |
+          export TEST_DIR=`pwd`
+          export RUBY_INC_DIR=$(ruby ruby_inc_dir.rb)
+          export RUBY_PREFIX=$(ruby ruby_prefix.rb)
+          cmake -S . -B build
+          cmake --build build
+          cd build && ctest

data/.github/workflows/run_tests.yml

@@ -0,0 +1,168 @@
+# Copyright (c) 2021 SolarWinds, LLC.
+# All rights reserved.
+
+name: Run Ruby Tests on Ubuntu
+
+on:
+#  push:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [3.0, 2.7, 2.6, 2.5, 2.4]
+        gemfile:
+          - libraries
+          - unit
+          - instrumentation_mocked
+          - instrumentation_mocked_oldgems
+          - frameworks
+          - rails61
+          - rails60
+          - rails52
+          - rails42
+          - delayed_job
+          - noop
+        dbtype: [postgresql, mysql2]
+        exclude:
+          - ruby: 3.0
+            gemfile: rails52
+          - ruby: 3.0
+            gemfile: rails42
+          - ruby: 2.7
+            gemfile: rails42
+          - ruby: 2.6
+            gemfile: rails42
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4  # excluding because of new sprockets version (4.0.0)
+            gemfile: rails52
+
+          - gemfile: unit
+            dbtype: mysql2
+          - gemfile: noop
+            dbtype: mysql2
+          - gemfile: libraries
+            dbtype: mysql2
+          - gemfile: instrumentation_mocked
+            dbtype: mysql2
+          - gemfile: instrumentation_mocked_oldgems
+            dbtype: mysql2
+          - gemfile: frameworks
+            dbtype: mysql2
+          - gemfile: delayed_job
+            dbtype: mysql2
+
+    container:
+      image:  ruby:${{ matrix.ruby }}
+
+    name: ${{ matrix.ruby }} - ${{ matrix.gemfile }}
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      APPOPTICS_GEM_TEST: true
+      APPOPTICS_REPORTER: file
+      APPOPTICS_COLLECTOR: /tmp/appoptics_traces.bson
+      APPOPTICS_MONGO_SERVER: "mongo"
+      APPOPTICS_RABBITMQ_SERVER: "rabbitmq"
+      APPOPTICS_MEMCACHED_SERVER: "memcached"
+      APPOPTICS_REPORTER_FILE_SINGLE: false
+      APPOPTICS_FROM_S3: true
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_HOST: "mysql"
+      MYSQL_DATABASE: "travis_ci_test"
+      POSTGRES_DB: "travis_ci_test"
+      DOCKER_MYSQL_PASS: "admin"
+      DOCKER_PSQL_PASS: "postgres"
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
+      POSTGRES_HOST: "postgres"
+      REDIS_PASSWORD: "redis_pass"
+    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: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"
+      postgres:
+        image: postgres:10.8
+        env:
+          POSTGRES_DB: postgres
+        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: travis_ci_test
+          MYSQL_ROOT_PASSWORD: admin
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: apt update && apt install -y --no-install-recommends bison libcurl4-gnutls-dev libsasl2-dev postgresql-client
+
+      - name: Set database type env var
+        run: export DBTYPE=${{ matrix.dbtype }}
+
+      - name: Add javascript runtime
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: Initialize services
+        run: |
+          export PGPASSWORD=$POSTGRES_PASSWORD; psql -c 'create database travis_ci_test;' -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" &
+
+      - name: Bundle with 1.17.3
+        if: matrix.gemfile == 'rails42' || matrix.gemfile == 'frameworks'
+        run: |
+          gem install bundler:1.17.3
+          export BUNDLE_GEMFILE=gemfiles/${{ matrix.gemfile }}.gemfile
+          bundle _1.17.3_ install --jobs 4 --retry 3
+      - name: Bundle
+        if: matrix.gemfile != 'rails42' && matrix.gemfile != 'frameworks'
+        run: |
+          gem install bundler
+          export BUNDLE_GEMFILE=gemfiles/${{ matrix.gemfile }}.gemfile
+          bundle install --jobs 4 --retry 3
+
+      - name: Install swig 4.0.2
+        working-directory: .github/workflows/swig
+        run: |
+          tar -xf swig-v4.0.2.tar.gz -C /tmp
+          cd /tmp/swig-4.0.2
+          ./autogen.sh && ./configure && make && make install
+          cd -
+
+      - name: Compile c-extension
+        run: |
+          bundle exec rake fetch compile
+
+      - name: Run tests
+        run: bundle exec rake test