Merge branch 'main' into pg-prepend-comment

open-telemetry · Feb 8, 2024 · d9bf281 · d9bf281
2 parents 676425c + 11ae23d
commit d9bf281
Show file tree

Hide file tree

Showing 149 changed files with 3,280 additions and 408 deletions.
diff --git a/.commit-me.json b/.commit-me.json
@@ -0,0 +1,4 @@
+{
+  "include-pull-requests": true,
+    "types": [ "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "release", "revert", "squash", "style", "test" ]
+}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,6 +9,14 @@ updates:
   directory: "/"
   schedule:
     interval: weekly
+- package-ecosystem: bundler
+  directory: "/helpers/mysql"
+  schedule:
+    interval: weekly
+- package-ecosystem: bundler
+  directory: "/helpers/sql-obfuscation"
+  schedule:
+    interval: weekly
 - package-ecosystem: bundler
   directory: "/propagator/ottrace"
   schedule:

diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml
@@ -6,6 +6,53 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
+  helpers:
+    strategy:
+      fail-fast: false
+      matrix:
+        gem:
+          - mysql
+          - sql-obfuscation
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Test Ruby 3.2"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.2"
+      - name: "Test Ruby 3.1"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.1"
+      - name: "Test Ruby 3.0"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.0"
+          yard: true
+          rubocop: true
+          build: true
+      - name: "Test JRuby"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "jruby-9.4.2.0"
+      - name: "Test truffleruby"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "truffleruby"
+
   propagators:
     strategy:
       fail-fast: false

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -10,6 +10,45 @@ on:
       - main
 
 jobs:
+  helpers:
+    strategy:
+      fail-fast: false
+      matrix:
+        gem:
+          - mysql
+          - sql-obfuscation
+        os:
+          - ubuntu-latest
+    name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Test Ruby 3.2"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.2"
+      - name: "Test Ruby 3.1"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.1"
+      - name: "Test Ruby 3.0"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "3.0"
+          yard: true
+          rubocop: true
+          build: true
+      - name: "Test JRuby"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-helpers-${{ matrix.gem }}"
+          ruby: "jruby-9.4.2.0"
+
   propagators:
     strategy:
       fail-fast: false

diff --git a/.github/workflows/conventional-commits.yaml b/.github/workflows/conventional-commits.yaml
@@ -0,0 +1,32 @@
+name: Conventional Commits Validation
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - edited
+
+permissions:
+  contents: read
+  pull-requests: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}  # Ensure that only one instance of this workflow is running per Pull Request
+  cancel-in-progress: true  # Cancel any previous runs of this workflow
+
+jobs:
+  validate-commits:
+    name: Conventional Commits Validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dev-build-deploy/[email protected]
+        env:
+          FORCE_COLOR: 3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          include-commits: false
+          update-labels: false
+          config: ".commit-me.json"
diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1.165.1
+      - uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml
@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.165.1
+        uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install Toys
-        run: "gem install --no-document toys -v 0.15.3"
+        run: "gem install --no-document toys -v 0.15.5"
       - name: Process release request
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml
@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.165.1
+        uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install Toys
-        run: "gem install --no-document toys -v 0.15.3"
+        run: "gem install --no-document toys -v 0.15.5"
       - name: Update open releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.165.1
+        uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install Toys
-        run: "gem install --no-document toys -v 0.15.3"
+        run: "gem install --no-document toys -v 0.15.5"
       - name: Perform release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -12,39 +12,31 @@ permissions:
   pull-requests: write
 
 jobs:
-  release:
+  prepare:
     name: Process Release
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e
-        id: release
+      - uses: google-github-actions/release-please-action@v4.0.2
+        id: prepare
 
     outputs:
-      paths_released: ${{ steps.release.outputs.paths_released }}
+      paths_released: ${{ steps.prepare.outputs.paths_released }}
 
   publish:
-    needs: release
+    needs: prepare
     name: Publish Gems
     runs-on: ubuntu-latest
-    if: ${{ needs.release.outputs.paths_released != '[]'}}
+    if: ${{ needs.prepare.outputs.paths_released != '[]'}}
 
     strategy:
       fail-fast: false
       max-parallel: 1
       matrix:
-        path: ${{ fromJson(needs.release.outputs.paths_released) }}
+        path: ${{ fromJson(needs.prepare.outputs.paths_released) }}
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88
-        with:
-          ruby-version: 3.0.0
-          bundler: latest
-          bundler-cache: false
-
+      - name: Checkout Repository
+        uses: actions/checkout@v4
       - name: Configure RubyGems
         env:
           GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}"
@@ -55,9 +47,15 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - name: Release Gem
+      - uses: ruby/[email protected]
+        with:
+          ruby-version: "3.0"
+          bundler: latest
+          bundler-cache: false
+          working-directory: ${{ matrix.path }}
+
+      - name: Publish to RubyGems
         working-directory: ${{ matrix.path }}
         run: |
-          bundle install
           bundle exec rake --trace build
           bundle exec rake --trace release:rubygem_push
diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.165.1
+        uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install Toys
-        run: "gem install --no-document toys -v 0.15.3"
+        run: "gem install --no-document toys -v 0.15.5"
       - name: Open release pull request
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -19,13 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.165.1
+        uses: ruby/setup-ruby@v1.171.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Install Toys
-        run: "gem install --no-document toys -v 0.15.3"
+        run: "gem install --no-document toys -v 0.15.5"
       - name: Retry release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,13 +1,15 @@
 {
+  "helpers/mysql": "0.0.0",
+  "helpers/sql_obfuscation": "0.0.0",
   "instrumentation/gruf": "0.1.1",
   "instrumentation/grape": "0.1.6",
   "instrumentation/racecar": "0.3.0",
   "instrumentation/rake": "0.2.1",
   "instrumentation/rdkafka": "0.4.2",
-  "instrumentation/trilogy": "0.57.0",
+  "instrumentation/trilogy": "0.58.0",
   "instrumentation/active_support": "0.5.1",
   "instrumentation/action_view": "0.7.0",
-  "instrumentation/action_pack": "0.8.0",
+  "instrumentation/action_pack": "0.9.0",
   "instrumentation/active_job": "0.7.1",
   "instrumentation/resque": "0.5.0",
   "instrumentation/bunny": "0.21.1",
@@ -32,15 +34,15 @@
   "instrumentation/net_http": "0.22.4",
   "instrumentation/pg": "0.26.1",
   "instrumentation/que": "0.7.1",
-  "instrumentation/rack": "0.23.5",
-  "instrumentation/rails": "0.29.1",
+  "instrumentation/rack": "0.24.0",
+  "instrumentation/rails": "0.30.0",
   "instrumentation/redis": "0.25.3",
   "instrumentation/restclient": "0.22.3",
   "instrumentation/rspec": "0.3.2",
   "instrumentation/ruby_kafka": "0.21.0",
   "instrumentation/sidekiq": "0.25.0",
   "instrumentation/sinatra": "0.23.2",
-  "instrumentation/all": "0.54.0",
+  "instrumentation/all": "0.56.0",
   "propagator/ottrace": "0.21.2",
   "propagator/xray": "0.22.1",
   "resources/azure": "0.1.0",

diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml
@@ -34,6 +34,15 @@ gems:
     directory: instrumentation/gruf
     version_constant: [OpenTelemetry, Instrumentation, Gruf, VERSION]
 
+  - name: opentelemetry-helpers-mysql
+    directory: helpers/mysql
+    version_constant: [OpenTelemetry, Helpers, MySQL, VERSION]
+
+  - name: opentelemetry-helpers-sql-obfuscation
+    directory: helpers/sql-obfuscation
+    version_rb_path: lib/opentelemetry/helpers/sql_obfuscation/version.rb
+    version_constant: [OpenTelemetry, Helpers, SqlObfuscation, VERSION]
+
   - name: opentelemetry-instrumentation-grape
     directory: instrumentation/grape
     version_constant: [OpenTelemetry, Instrumentation, Grape, VERSION]
@@ -204,6 +213,10 @@ gems:
     directory: propagator/ottrace
     version_constant: [OpenTelemetry, Propagator, OTTrace, VERSION]
 
+  - name: opentelemetry-propagator-vitess
+    directory: propagator/vitess
+    version_constant: [OpenTelemetry, Propagator, Vitess, VERSION]
+
   - name: opentelemetry-propagator-xray
     directory: propagator/xray
     version_constant: [OpenTelemetry, Propagator, XRay, VERSION]

diff --git a/.toys/.toys.rb b/.toys/.toys.rb
@@ -1,7 +1,7 @@
-toys_version! "0.15.3"
+toys_version! ">= 0.15.5"
 
 load_git remote: "https://github.com/dazuma/toys.git",
          path: ".toys/release",
          as: "release",
-         commit: "toys/v0.15.3",
+         commit: "common-tools/v0.15.5.1",
          update: 3600