Skip to content

Commit c9b8e46

Browse files
hannahramadanhannahramadan
committed
Merge branch 'main' into edit_file_structure
2 parents aa94714 + 37409ca commit c9b8e46

File tree

322 files changed

+1212
-722
lines changed

Some content is hidden

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

322 files changed

+1212
-722
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ what happened and what you expected with a link to the relevant portion of the s
2626

2727
Operating system details: Linux, Ubuntu 20.04 LTS
2828
RUBY_ENGINE: "ruby"
29-
RUBY_VERSION: "3.1.1"
30-
RUBY_DESCRIPTION: "ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [arm64-darwin21]"
29+
RUBY_VERSION: "3.4"
30+
RUBY_DESCRIPTION: "ruby 3.4.1 (2024-12-25 revision 48d4efcb85) arm64-darwin21]"
3131

3232
**Share a simplified reproduction if possible**
3333

‎.github/dependabot.yml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,25 @@ updates:
55
directory: "/"
66
schedule:
77
interval: daily
8+
# Update all dependencies - processes from root to handle path dependencies correctly
89
- package-ecosystem: bundler
910
directory: "/"
1011
schedule:
1112
interval: weekly
13+
ignore:
14+
# Ignore internal instrumentation interdependencies managed via local paths in Gemfiles
15+
- dependency-name: "opentelemetry-instrumentation-*"
16+
- dependency-name: "opentelemetry-helpers-*"
17+
- dependency-name: "opentelemetry-processor-*"
18+
- dependency-name: "opentelemetry-propagator-*"
19+
- dependency-name: "opentelemetry-sampler-*"
20+
- dependency-name: "opentelemetry-resource-detector-*"
1221
groups:
13-
all-gems:
22+
production-dependencies:
23+
dependency-type: "production"
1424
patterns:
15-
- "**/Gemfile"
25+
- "*"
26+
development-dependencies:
27+
dependency-type: "development"
28+
patterns:
29+
- "*"

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

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ jobs:
4949
with:
5050
gem: "opentelemetry-helpers-${{ matrix.gem }}"
5151
ruby: "3.2"
52-
- name: "Test Ruby 3.1"
53-
uses: ./.github/actions/test_gem
54-
with:
55-
gem: "opentelemetry-helpers-${{ matrix.gem }}"
56-
ruby: "3.1"
5752
yard: true
5853
rubocop: true
5954
coverage: true
@@ -63,7 +58,7 @@ jobs:
6358
uses: ./.github/actions/test_gem
6459
with:
6560
gem: "opentelemetry-helpers-${{ matrix.gem }}"
66-
ruby: "jruby-9.4.12.0"
61+
ruby: "jruby-10.0.2.0"
6762

6863
propagators:
6964
strategy:
@@ -95,11 +90,6 @@ jobs:
9590
with:
9691
gem: "opentelemetry-propagator-${{ matrix.gem }}"
9792
ruby: "3.2"
98-
- name: "Test Ruby 3.1"
99-
uses: ./.github/actions/test_gem
100-
with:
101-
gem: "opentelemetry-propagator-${{ matrix.gem }}"
102-
ruby: "3.1"
10393
yard: true
10494
rubocop: true
10595
build: true
@@ -108,7 +98,7 @@ jobs:
10898
uses: ./.github/actions/test_gem
10999
with:
110100
gem: "opentelemetry-propagator-${{ matrix.gem }}"
111-
ruby: "jruby-9.4.12.0"
101+
ruby: "jruby-10.0.2.0"
112102

113103
resource-detectors:
114104
strategy:
@@ -140,11 +130,6 @@ jobs:
140130
with:
141131
gem: "opentelemetry-${{ matrix.gem }}"
142132
ruby: "3.2"
143-
- name: "Test Ruby 3.1"
144-
uses: ./.github/actions/test_gem
145-
with:
146-
gem: "opentelemetry-${{ matrix.gem }}"
147-
ruby: "3.1"
148133
yard: true
149134
rubocop: true
150135
coverage: true
@@ -154,7 +139,7 @@ jobs:
154139
uses: ./.github/actions/test_gem
155140
with:
156141
gem: "opentelemetry-${{ matrix.gem }}"
157-
ruby: "jruby-9.4.12.0"
142+
ruby: "jruby-10.0.2.0"
158143

159144
processors:
160145
strategy:
@@ -183,11 +168,6 @@ jobs:
183168
with:
184169
gem: "opentelemetry-processor-${{ matrix.gem }}"
185170
ruby: "3.2"
186-
- name: "Test Ruby 3.1"
187-
uses: ./.github/actions/test_gem
188-
with:
189-
gem: "opentelemetry-processor-${{ matrix.gem }}"
190-
ruby: "3.1"
191171
yard: true
192172
rubocop: true
193173
coverage: true
@@ -197,7 +177,7 @@ jobs:
197177
uses: ./.github/actions/test_gem
198178
with:
199179
gem: "opentelemetry-processor-${{ matrix.gem }}"
200-
ruby: "jruby-9.4.12.0"
180+
ruby: "jruby-10.0.2.0"
201181

202182
samplers:
203183
strategy:
@@ -226,11 +206,6 @@ jobs:
226206
with:
227207
gem: "opentelemetry-sampler-${{ matrix.gem }}"
228208
ruby: "3.2"
229-
- name: "Test Ruby 3.1"
230-
uses: ./.github/actions/test_gem
231-
with:
232-
gem: "opentelemetry-sampler-${{ matrix.gem }}"
233-
ruby: "3.1"
234209
yard: true
235210
rubocop: true
236211
coverage: true
@@ -240,4 +215,4 @@ jobs:
240215
uses: ./.github/actions/test_gem
241216
with:
242217
gem: "opentelemetry-sampler-${{ matrix.gem }}"
243-
ruby: "jruby-9.4.12.0"
218+
ruby: "jruby-10.0.2.0"

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,10 @@ jobs:
4747
with:
4848
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
4949
ruby: "3.2"
50-
- name: "Test Ruby 3.1"
51-
uses: ./.github/actions/test_gem
52-
with:
53-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
54-
ruby: "3.1"
5550
yard: true
5651
rubocop: true
5752
coverage: true
5853
build: true
59-
- name: "Test JRuby"
60-
uses: ./.github/actions/test_gem
61-
with:
62-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
63-
ruby: "jruby-9.4.12.0"
6454
services:
6555
memcached:
6656
image: memcached:alpine
@@ -99,11 +89,6 @@ jobs:
9989
with:
10090
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
10191
ruby: "3.2"
102-
- name: "Test Ruby 3.1"
103-
uses: ./.github/actions/test_gem
104-
with:
105-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
106-
ruby: "3.1"
10792
yard: true
10893
rubocop: true
10994
coverage: true
@@ -142,11 +127,6 @@ jobs:
142127
with:
143128
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
144129
ruby: "3.2"
145-
- name: "Test Ruby 3.1"
146-
uses: ./.github/actions/test_gem
147-
with:
148-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
149-
ruby: "3.1"
150130
yard: true
151131
rubocop: true
152132
coverage: true
@@ -201,11 +181,6 @@ jobs:
201181
with:
202182
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
203183
ruby: "3.2"
204-
- name: "Test Ruby 3.1"
205-
uses: ./.github/actions/test_gem
206-
with:
207-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
208-
ruby: "3.1"
209184
yard: true
210185
rubocop: true
211186
coverage: true
@@ -251,11 +226,6 @@ jobs:
251226
with:
252227
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
253228
ruby: "3.2"
254-
- name: "Test Ruby 3.1"
255-
uses: ./.github/actions/test_gem
256-
with:
257-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
258-
ruby: "3.1"
259229
yard: true
260230
rubocop: true
261231
coverage: true
@@ -298,11 +268,6 @@ jobs:
298268
with:
299269
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
300270
ruby: "3.2"
301-
- name: "Test Ruby 3.1"
302-
uses: ./.github/actions/test_gem
303-
with:
304-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
305-
ruby: "3.1"
306271
yard: true
307272
rubocop: true
308273
coverage: true

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ jobs:
7979
with:
8080
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
8181
ruby: "3.2"
82-
- name: "Test Ruby 3.1"
83-
uses: ./.github/actions/test_gem
84-
with:
85-
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
86-
ruby: "3.1"
8782
yard: true
8883
rubocop: true
8984
coverage: true
@@ -118,4 +113,4 @@ jobs:
118113
uses: ./.github/actions/test_gem
119114
with:
120115
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
121-
ruby: "jruby-9.4.12.0"
116+
ruby: "jruby-10.0.2.0"

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1717

1818
- name: Install Ruby 3.4
19-
uses: ruby/setup-ruby@v1.263.0
19+
uses: ruby/setup-ruby@v1.267.0
2020
with:
2121
ruby-version: 3.4
2222
- name: Generate Gemfile.lock

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ jobs:
2121
- 3.4
2222
- 3.3
2323
- 3.2
24-
- 3.1
2524
name: ${{ matrix.ruby-version }}
2625
runs-on: ubuntu-latest
2726
steps:
2827
- uses: actions/checkout@v5
2928
# ATTENTION: Dependabot does not know how to update shared actions file.
3029
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
31-
- uses: ruby/setup-ruby@v1.263.0
30+
- uses: ruby/setup-ruby@v1.267.0
3231
with:
3332
ruby-version: ${{ matrix.ruby-version }}
3433
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# uploads of run results in SARIF format to the repository Actions tab.
3535
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3636
- name: "Upload artifact"
37-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
37+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3838
with:
3939
name: SARIF file
4040
path: results.sarif
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
46+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4747
with:
4848
sarif_file: results.sarif

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ jobs:
1212
permissions:
1313
contents: write # required for creating releases
1414
pull-requests: write # required for updating release PRs
15+
issues: write # required to create issues for failed releases
1516
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1617
env:
17-
ruby_version: "3.1"
18+
RUBY_VERSION: "3.2"
1819
runs-on: ubuntu-latest
1920
steps:
20-
- name: Install Ruby ${{ env.ruby_version }}
21-
uses: ruby/setup-ruby@v1.263.0
21+
- name: Install Ruby ${{ env.RUBY_VERSION }}
22+
uses: ruby/setup-ruby@v1.267.0
2223
with:
23-
ruby-version: ${{ env.ruby_version }}
24+
ruby-version: ${{ env.RUBY_VERSION }}
2425
- name: Checkout repo
2526
uses: actions/checkout@v5
2627
- name: Install Toys

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
pull-requests: write # required for updating release PRs
1616
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
1717
env:
18-
ruby_version: "3.1"
18+
RUBY_VERSION: "3.2"
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.263.0
21+
- name: Install Ruby ${{ env.RUBY_VERSION }}
22+
uses: ruby/setup-ruby@v1.267.0
2323
with:
24-
ruby-version: ${{ env.ruby_version }}
24+
ruby-version: ${{ env.RUBY_VERSION }}
2525
- name: Checkout repo
2626
uses: actions/checkout@v5
2727
- name: Install Toys

0 commit comments

Comments
 (0)