Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
be76110
Update action.yml
thompson-tomo Mar 28, 2026
a9d8a89
Update action.yml
thompson-tomo Mar 28, 2026
7037d76
Update action.yml
thompson-tomo Mar 28, 2026
b973cb2
collate coverage
thompson-tomo Mar 28, 2026
9a1b5ad
formatting fix
thompson-tomo Mar 28, 2026
bb200ac
Update action.yml
thompson-tomo Mar 28, 2026
899ccee
Update action.yml
thompson-tomo Mar 28, 2026
5147cf1
Update action.yml
thompson-tomo Mar 28, 2026
2a6fcc9
Update action.yml
thompson-tomo Mar 28, 2026
80de8f7
remove coverage variable
thompson-tomo Apr 5, 2026
4c7f044
Merge branch 'open-telemetry:main' into patch-5
thompson-tomo Apr 5, 2026
78153fd
Update action.yml
thompson-tomo Apr 5, 2026
3148940
Revert last change
thompson-tomo Apr 5, 2026
1503f81
Set coverage thresholds for CI based on gem
thompson-tomo Apr 5, 2026
5271919
Fix
thompson-tomo Apr 5, 2026
dfe288d
Set coverage threshold for CI jobs
thompson-tomo Apr 5, 2026
0b652f2
Add missing framework
thompson-tomo Apr 5, 2026
bf8cc41
use config rather than custom step
thompson-tomo Apr 5, 2026
27f900d
Update ci-instrumentation-full.yml
thompson-tomo Apr 5, 2026
01b9f43
use env
thompson-tomo Apr 5, 2026
ac2defa
replicate to redis
thompson-tomo Apr 5, 2026
60e9d2e
tidy up
thompson-tomo Apr 5, 2026
20b652a
use env as name of object as that is gh term
thompson-tomo Apr 6, 2026
336e20c
Update ci-instrumentation-full.yml
thompson-tomo Apr 6, 2026
31251ff
Merge branch 'main' into patch-5
thompson-tomo Apr 7, 2026
1971419
Merge branch 'main' into patch-5
thompson-tomo Apr 9, 2026
98d67e6
Merge branch 'main' into patch-5
thompson-tomo Apr 9, 2026
aab84b0
Merge branch 'main' into patch-5
kaylareopelle Apr 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/actions/test_gem/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ inputs:
required: false
type: boolean
default: false
coverage:
description: Enforce test coverage
required: false
type: boolean
default: false
minimum_coverage:
description: Minimum test coverage
required: false
Expand Down Expand Up @@ -155,10 +150,9 @@ runs:

- name: Coverage
shell: bash
if: "${{ inputs.coverage == 'true' }}"
# This starts a new simplecov run which tracks nothing of its own,
# but merges with the existing coverage reports generated during testing.
run: 'bundle exec ruby -e ''require "simplecov"; SimpleCov.minimum_coverage(${{ inputs.minimum_coverage }})'''
run: 'bundle exec ruby -e ''require "simplecov"; SimpleCov.minimum_coverage(${{ inputs.minimum_coverage || 85 }}); SimpleCov.collate Dir["coverage/**/.resultset.json"];'''
working-directory: "${{ steps.setup.outputs.gem_dir }}"

- name: Build Gem
Expand Down
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ci:
- changed-files:
- any-glob-to-any-file:
- ".github/**"
- "**/.github-ci.yml"

deprecated:
- changed-files:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci-contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
gem: "opentelemetry-helpers-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down Expand Up @@ -143,7 +142,6 @@ jobs:
gem: "opentelemetry-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down Expand Up @@ -181,7 +179,6 @@ jobs:
gem: "opentelemetry-processor-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down Expand Up @@ -219,7 +216,6 @@ jobs:
gem: "opentelemetry-sampler-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/ci-instrumentation-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,42 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set environment variables
id: inputs
shell: bash
run: |
dir=$(find . -iname 'opentelemetry-instrumentation-${{ matrix.gem }}.gemspec' -exec dirname {} \;)
echo "gem_dir=${dir}" >> $GITHUB_OUTPUT

FILE="${dir}/.github-ci.yml"

if [[ -f "$FILE" ]]; then
echo "Loading env from $FILE"
# Convert YAML to key=value and export to GITHUB_ENV
yq '.env // {} | to_entries | .[] | "\(.key)=\(.value)"' "$FILE" >> "$GITHUB_ENV"
else
echo "No github ci file found in ($dir). Skipping."
fi
- name: "Test Ruby 4.0"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "4.0"
minimum_coverage: ${{ env.minimum_coverage }}
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
minimum_coverage: ${{ env.minimum_coverage }}
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
minimum_coverage: ${{ env.minimum_coverage }}
- name: "JRuby Filter"
id: jruby_skip
shell: bash
Expand Down Expand Up @@ -168,3 +186,4 @@ jobs:
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "jruby-10.0.2.0"
minimum_coverage: ${{ env.minimum_coverage }}
25 changes: 19 additions & 6 deletions .github/workflows/ci-instrumentation-with-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
services:
memcached:
Expand Down Expand Up @@ -118,7 +117,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
services:
mysql:
Expand Down Expand Up @@ -156,7 +154,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
services:
zookeeper:
Expand Down Expand Up @@ -194,24 +191,42 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set environment variables
id: inputs
shell: bash
run: |
dir=$(find . -iname 'opentelemetry-instrumentation-${{ matrix.gem }}.gemspec' -exec dirname {} \;)
echo "gem_dir=${dir}" >> $GITHUB_OUTPUT

FILE="${dir}/.github-ci.yml"

if [[ -f "$FILE" ]]; then
echo "Loading env from $FILE"
# Convert YAML to key=value and export to GITHUB_ENV
yq '.env // {} | to_entries | .[] | "\(.key)=\(.value)"' "$FILE" >> "$GITHUB_ENV"
else
echo "No github ci file found in ($dir). Skipping."
fi
- name: "Test Ruby 4.0"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "4.0"
minimum_coverage: ${{ env.minimum_coverage }}
- name: "Test Ruby 3.4"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.4"
minimum_coverage: ${{ env.minimum_coverage }}
- name: "Test Ruby 3.3"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
minimum_coverage: ${{ env.minimum_coverage }}
services:
redis:
image: redis:8.6.2@sha256:009cc37796fbdbe1b631b4cc0582bed167e5e403ed8bcd06f77eb6cb5aeb6f93
Expand Down Expand Up @@ -257,7 +272,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
services:
postgres:
Expand Down Expand Up @@ -299,7 +313,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
services:
rabbitmq:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
ruby: "3.3"
yard: true
coverage: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
Expand Down
2 changes: 2 additions & 0 deletions instrumentation/ethon/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 55
2 changes: 2 additions & 0 deletions instrumentation/excon/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 57
2 changes: 2 additions & 0 deletions instrumentation/faraday/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 65
2 changes: 2 additions & 0 deletions instrumentation/http/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 59
2 changes: 2 additions & 0 deletions instrumentation/http_client/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 62
2 changes: 2 additions & 0 deletions instrumentation/httpx/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 57
2 changes: 2 additions & 0 deletions instrumentation/net_http/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 57
2 changes: 2 additions & 0 deletions instrumentation/rack/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 58
2 changes: 2 additions & 0 deletions instrumentation/redis/.github-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
minimum_coverage: 75
Loading