Skip to content

Commit fc01a58

Browse files
joshwestbrookjoshwestbrook
authored
Merge branch 'main' into aws_lambda-programatic-wrap
2 parents 82e6f08 + f12b0d7 commit fc01a58

File tree

226 files changed

+773
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+773
-561
lines changed

‎.github/actions/test_gem/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ runs:
6666
# ...but not for appraisals, sadly.
6767
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6868
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
69-
uses: ruby/setup-ruby@v1.207.0
69+
uses: ruby/setup-ruby@v1.213.0
7070
with:
7171
ruby-version: "${{ inputs.ruby }}"
7272
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +77,7 @@ runs:
7777
# If we're using appraisals, do it all manually.
7878
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7979
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
80-
uses: ruby/setup-ruby@v1.207.0
80+
uses: ruby/setup-ruby@v1.213.0
8181
with:
8282
ruby-version: "${{ inputs.ruby }}"
8383
bundler: "latest"

‎.github/workflows/ci-contrib.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ jobs:
4444
with:
4545
gem: "opentelemetry-helpers-${{ matrix.gem }}"
4646
ruby: "3.1"
47-
- name: "Test Ruby 3.0"
48-
if: "${{ matrix.os == 'ubuntu-latest' }}"
49-
uses: ./.github/actions/test_gem
50-
with:
51-
gem: "opentelemetry-helpers-${{ matrix.gem }}"
52-
ruby: "3.0"
5347
yard: true
5448
rubocop: true
5549
build: true
@@ -89,12 +83,6 @@ jobs:
8983
with:
9084
gem: "opentelemetry-propagator-${{ matrix.gem }}"
9185
ruby: "3.1"
92-
- name: "Test Ruby 3.0"
93-
if: "${{ matrix.os == 'ubuntu-latest' }}"
94-
uses: ./.github/actions/test_gem
95-
with:
96-
gem: "opentelemetry-propagator-${{ matrix.gem }}"
97-
ruby: "3.0"
9886
yard: true
9987
rubocop: true
10088
build: true
@@ -134,15 +122,9 @@ jobs:
134122
with:
135123
gem: "opentelemetry-${{ matrix.gem }}"
136124
ruby: "3.1"
137-
- name: "Test Ruby 3.0"
138-
if: "${{ matrix.os == 'ubuntu-latest' }}"
139-
uses: ./.github/actions/test_gem
140-
with:
141-
gem: "opentelemetry-${{ matrix.gem }}"
142125
yard: true
143126
rubocop: true
144127
build: true
145-
ruby: "3.0"
146128
- name: "Test JRuby"
147129
if: "${{ matrix.os == 'ubuntu-latest' }}"
148130
uses: ./.github/actions/test_gem
@@ -177,12 +159,6 @@ jobs:
177159
with:
178160
gem: "opentelemetry-processor-${{ matrix.gem }}"
179161
ruby: "3.1"
180-
- name: "Test Ruby 3.0"
181-
if: "${{ matrix.os == 'ubuntu-latest' }}"
182-
uses: ./.github/actions/test_gem
183-
with:
184-
gem: "opentelemetry-processor-${{ matrix.gem }}"
185-
ruby: "3.0"
186162
yard: true
187163
rubocop: true
188164
build: true

‎.github/workflows/ci-instrumentation-with-services.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ jobs:
4444
with:
4545
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
4646
ruby: "3.1"
47-
- name: "Test Ruby 3.0"
48-
uses: ./.github/actions/test_gem
49-
with:
50-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
51-
ruby: "3.0"
5247
yard: true
5348
rubocop: true
5449
build: true
@@ -95,11 +90,6 @@ jobs:
9590
with:
9691
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
9792
ruby: "3.1"
98-
- name: "Test Ruby 3.0"
99-
uses: ./.github/actions/test_gem
100-
with:
101-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
102-
ruby: "3.0"
10393
yard: true
10494
rubocop: true
10595
build: true
@@ -137,11 +127,6 @@ jobs:
137127
with:
138128
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
139129
ruby: "3.1"
140-
- name: "Test Ruby 3.0"
141-
uses: ./.github/actions/test_gem
142-
with:
143-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
144-
ruby: "3.0"
145130
yard: true
146131
rubocop: true
147132
build: true
@@ -195,11 +180,6 @@ jobs:
195180
with:
196181
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
197182
ruby: "3.1"
198-
- name: "Test Ruby 3.0"
199-
uses: ./.github/actions/test_gem
200-
with:
201-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
202-
ruby: "3.0"
203183
yard: true
204184
rubocop: true
205185
build: true
@@ -244,11 +224,6 @@ jobs:
244224
with:
245225
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
246226
ruby: "3.1"
247-
- name: "Test Ruby 3.0"
248-
uses: ./.github/actions/test_gem
249-
with:
250-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
251-
ruby: "3.0"
252227
yard: true
253228
rubocop: true
254229
build: true
@@ -290,11 +265,6 @@ jobs:
290265
with:
291266
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
292267
ruby: "3.1"
293-
- name: "Test Ruby 3.0"
294-
uses: ./.github/actions/test_gem
295-
with:
296-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
297-
ruby: "3.0"
298268
yard: true
299269
rubocop: true
300270
build: true

‎.github/workflows/ci-instrumentation.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- faraday
4040
- grape
4141
- graphql
42+
- grpc
4243
- gruf
4344
- http
4445
- http_client
@@ -73,12 +74,6 @@ jobs:
7374
with:
7475
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
7576
ruby: "3.1"
76-
- name: "Test Ruby 3.0"
77-
if: "${{ matrix.os == 'ubuntu-latest' }}"
78-
uses: ./.github/actions/test_gem
79-
with:
80-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
81-
ruby: "3.0"
8277
yard: true
8378
rubocop: true
8479
build: true
@@ -102,6 +97,7 @@ jobs:
10297
[[ "${{ matrix.gem }}" == "lmdb" ]] && echo "skip=true" >> $GITHUB_OUTPUT
10398
[[ "${{ matrix.gem }}" == "rack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
10499
[[ "${{ matrix.gem }}" == "rails" ]] && echo "skip=true" >> $GITHUB_OUTPUT
100+
[[ "${{ matrix.gem }}" == "grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
105101
[[ "${{ matrix.gem }}" == "gruf" ]] && echo "skip=true" >> $GITHUB_OUTPUT
106102
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
107103
true

‎.github/workflows/installation-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626
# ATTENTION: Dependabot does not know how to update shared actions file.
2727
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
28-
- uses: ruby/setup-ruby@v1.207.0
28+
- uses: ruby/setup-ruby@v1.213.0
2929
with:
3030
ruby-version: ${{ matrix.ruby-version }}
3131
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

‎.github/workflows/release-hook-on-closed.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
release-process-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.207.0
15+
uses: ruby/setup-ruby@v1.213.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

‎.github/workflows/release-hook-on-push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
release-update-open-requests:
1010
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1111
env:
12-
ruby_version: "3.0"
12+
ruby_version: "3.1"
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}
16-
uses: ruby/setup-ruby@v1.207.0
16+
uses: ruby/setup-ruby@v1.213.0
1717
with:
1818
ruby-version: ${{ env.ruby_version }}
1919
- name: Checkout repo

‎.github/workflows/release-perform.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
release-perform:
1919
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
2020
env:
21-
ruby_version: "3.0"
21+
ruby_version: "3.1"
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.207.0
25+
uses: ruby/setup-ruby@v1.213.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

‎.github/workflows/release-please.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ jobs:
5050
chmod 0600 $HOME/.gem/credentials
5151
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
5252
53-
- uses: ruby/setup-ruby@v1.207.0
53+
- uses: ruby/setup-ruby@v1.213.0
5454
with:
55-
ruby-version: "3.0"
55+
ruby-version: "3.1"
5656
bundler: latest
5757
bundler-cache: false
5858
working-directory: ${{ matrix.path }}

‎.github/workflows/release-request-weekly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
release-request:
99
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1010
env:
11-
ruby_version: "3.0"
11+
ruby_version: "3.1"
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.207.0
15+
uses: ruby/setup-ruby@v1.213.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

0 commit comments

Comments
 (0)