Skip to content

Commit 61b4575

Browse files
arielvalentinarielvalentin
authored
Merge branch 'main' into ad/fix-rspec-one-liner-descriptions
2 parents aa36061 + 1186594 commit 61b4575

File tree

272 files changed

+1648
-971
lines changed

Some content is hidden

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

272 files changed

+1648
-971
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/workflows/check-spelling.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ on:
55
push:
66
branches:
77
- main
8+
paths: &path_filters
9+
- 'helpers/**'
10+
- 'propagator/**'
11+
- 'resources/**'
12+
- 'processor/**'
13+
- 'sampler/**'
14+
- '.github/workflows/ci-contrib.yml'
15+
- '.github/actions/**'
16+
- 'Gemfile'
17+
- 'Rakefile'
18+
- '.rubocop.yml'
19+
- 'gemspecs/**'
820
pull_request:
921
branches:
1022
- main
23+
paths: *path_filters
1124
schedule:
1225
- cron: "0 0 * * *"
1326

@@ -49,11 +62,6 @@ jobs:
4962
with:
5063
gem: "opentelemetry-helpers-${{ matrix.gem }}"
5164
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"
5765
yard: true
5866
rubocop: true
5967
coverage: true
@@ -63,7 +71,7 @@ jobs:
6371
uses: ./.github/actions/test_gem
6472
with:
6573
gem: "opentelemetry-helpers-${{ matrix.gem }}"
66-
ruby: "jruby-9.4.12.0"
74+
ruby: "jruby-10.0.2.0"
6775

6876
propagators:
6977
strategy:
@@ -95,11 +103,6 @@ jobs:
95103
with:
96104
gem: "opentelemetry-propagator-${{ matrix.gem }}"
97105
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"
103106
yard: true
104107
rubocop: true
105108
build: true
@@ -108,7 +111,7 @@ jobs:
108111
uses: ./.github/actions/test_gem
109112
with:
110113
gem: "opentelemetry-propagator-${{ matrix.gem }}"
111-
ruby: "jruby-9.4.12.0"
114+
ruby: "jruby-10.0.2.0"
112115

113116
resource-detectors:
114117
strategy:
@@ -140,11 +143,6 @@ jobs:
140143
with:
141144
gem: "opentelemetry-${{ matrix.gem }}"
142145
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"
148146
yard: true
149147
rubocop: true
150148
coverage: true
@@ -154,7 +152,7 @@ jobs:
154152
uses: ./.github/actions/test_gem
155153
with:
156154
gem: "opentelemetry-${{ matrix.gem }}"
157-
ruby: "jruby-9.4.12.0"
155+
ruby: "jruby-10.0.2.0"
158156

159157
processors:
160158
strategy:
@@ -183,11 +181,6 @@ jobs:
183181
with:
184182
gem: "opentelemetry-processor-${{ matrix.gem }}"
185183
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"
191184
yard: true
192185
rubocop: true
193186
coverage: true
@@ -197,7 +190,7 @@ jobs:
197190
uses: ./.github/actions/test_gem
198191
with:
199192
gem: "opentelemetry-processor-${{ matrix.gem }}"
200-
ruby: "jruby-9.4.12.0"
193+
ruby: "jruby-10.0.2.0"
201194

202195
samplers:
203196
strategy:
@@ -226,11 +219,6 @@ jobs:
226219
with:
227220
gem: "opentelemetry-sampler-${{ matrix.gem }}"
228221
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"
234222
yard: true
235223
rubocop: true
236224
coverage: true
@@ -240,4 +228,4 @@ jobs:
240228
uses: ./.github/actions/test_gem
241229
with:
242230
gem: "opentelemetry-sampler-${{ matrix.gem }}"
243-
ruby: "jruby-9.4.12.0"
231+
ruby: "jruby-10.0.2.0"

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

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
name: CI Instrumentation Full
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
paths: &path_filters
9+
- 'helpers/**'
10+
- 'instrumentation/action_mailer/**'
11+
- 'instrumentation/action_pack/**'
12+
- 'instrumentation/action_view/**'
13+
- 'instrumentation/active_job/**'
14+
- 'instrumentation/active_model_serializers/**'
15+
- 'instrumentation/active_record/**'
16+
- 'instrumentation/active_storage/**'
17+
- 'instrumentation/active_support/**'
18+
- 'instrumentation/aws_sdk/**'
19+
- 'instrumentation/aws_lambda/**'
20+
- 'instrumentation/base/**'
21+
- 'instrumentation/concurrent_ruby/**'
22+
- 'instrumentation/delayed_job/**'
23+
- 'instrumentation/ethon/**'
24+
- 'instrumentation/excon/**'
25+
- 'instrumentation/faraday/**'
26+
- 'instrumentation/grape/**'
27+
- 'instrumentation/graphql/**'
28+
- 'instrumentation/grpc/**'
29+
- 'instrumentation/gruf/**'
30+
- 'instrumentation/http/**'
31+
- 'instrumentation/http_client/**'
32+
- 'instrumentation/httpx/**'
33+
- 'instrumentation/koala/**'
34+
- 'instrumentation/lmdb/**'
35+
- 'instrumentation/logger/**'
36+
- 'instrumentation/net_http/**'
37+
- 'instrumentation/rack/**'
38+
- 'instrumentation/rails/**'
39+
- 'instrumentation/restclient/**'
40+
- 'instrumentation/rspec/**'
41+
- 'instrumentation/sinatra/**'
42+
- '.github/workflows/ci-instrumentation-full.yml'
43+
- '.github/actions/**'
44+
- 'Gemfile'
45+
- 'Rakefile'
46+
- '.rubocop.yml'
47+
- 'gemspecs/**'
48+
pull_request:
49+
branches:
50+
- main
51+
paths: *path_filters
52+
schedule:
53+
- cron: "0 0 * * *"
54+
55+
permissions:
56+
contents: read
57+
58+
concurrency:
59+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
60+
cancel-in-progress: true # Cancel any previous runs of this workflow
61+
62+
jobs:
63+
instrumentation:
64+
strategy:
65+
fail-fast: false
66+
matrix:
67+
gem:
68+
- action_mailer
69+
- action_pack
70+
- action_view
71+
- active_job
72+
- active_model_serializers
73+
- active_record
74+
- active_storage
75+
- active_support
76+
- aws_sdk
77+
- aws_lambda
78+
- base
79+
- concurrent_ruby
80+
- delayed_job
81+
- ethon
82+
- excon
83+
- faraday
84+
- grape
85+
- graphql
86+
- grpc
87+
- gruf
88+
- http
89+
- http_client
90+
- httpx
91+
- koala
92+
- lmdb
93+
- logger
94+
- net_http
95+
- rack
96+
- rails
97+
- restclient
98+
- rspec
99+
- sinatra
100+
os:
101+
- ubuntu-latest
102+
103+
name: ${{ matrix.gem }} / ${{ matrix.os }}
104+
runs-on: ${{ matrix.os }}
105+
steps:
106+
- uses: actions/checkout@v5
107+
- name: "Test Ruby 3.4"
108+
uses: ./.github/actions/test_gem
109+
with:
110+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
111+
ruby: "3.4"
112+
- name: "Test Ruby 3.3"
113+
uses: ./.github/actions/test_gem
114+
with:
115+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
116+
ruby: "3.3"
117+
- name: "Test Ruby 3.2"
118+
uses: ./.github/actions/test_gem
119+
with:
120+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
121+
ruby: "3.2"
122+
yard: true
123+
rubocop: true
124+
coverage: true
125+
build: true
126+
- name: "JRuby Filter"
127+
id: jruby_skip
128+
shell: bash
129+
run: |
130+
echo "skip=false" >> $GITHUB_OUTPUT
131+
[[ "${{ matrix.gem }}" == "action_pack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
132+
[[ "${{ matrix.gem }}" == "action_view" ]] && echo "skip=true" >> $GITHUB_OUTPUT
133+
[[ "${{ matrix.gem }}" == "active_model_serializers" ]] && echo "skip=true" >> $GITHUB_OUTPUT
134+
[[ "${{ matrix.gem }}" == "active_record" ]] && echo "skip=true" >> $GITHUB_OUTPUT
135+
[[ "${{ matrix.gem }}" == "active_storage" ]] && echo "skip=true" >> $GITHUB_OUTPUT
136+
[[ "${{ matrix.gem }}" == "active_support" ]] && echo "skip=true" >> $GITHUB_OUTPUT
137+
[[ "${{ matrix.gem }}" == "aws_sdk" ]] && echo "skip=true" >> $GITHUB_OUTPUT
138+
[[ "${{ matrix.gem }}" == "aws_lambda" ]] && echo "skip=true" >> $GITHUB_OUTPUT
139+
[[ "${{ matrix.gem }}" == "delayed_job" ]] && echo "skip=true" >> $GITHUB_OUTPUT
140+
[[ "${{ matrix.gem }}" == "graphql" ]] && echo "skip=true" >> $GITHUB_OUTPUT
141+
[[ "${{ matrix.gem }}" == "http" ]] && echo "skip=true" >> $GITHUB_OUTPUT
142+
[[ "${{ matrix.gem }}" == "http_client" ]] && echo "skip=true" >> $GITHUB_OUTPUT
143+
[[ "${{ matrix.gem }}" == "koala" ]] && echo "skip=true" >> $GITHUB_OUTPUT
144+
[[ "${{ matrix.gem }}" == "lmdb" ]] && echo "skip=true" >> $GITHUB_OUTPUT
145+
[[ "${{ matrix.gem }}" == "rack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
146+
[[ "${{ matrix.gem }}" == "rails" ]] && echo "skip=true" >> $GITHUB_OUTPUT
147+
[[ "${{ matrix.gem }}" == "grpc" ]] && echo "skip=true" >> $GITHUB_OUTPUT
148+
[[ "${{ matrix.gem }}" == "gruf" ]] && echo "skip=true" >> $GITHUB_OUTPUT
149+
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
150+
true
151+
- name: "Test JRuby"
152+
if: "${{ matrix.os == 'ubuntu-latest' && steps.jruby_skip.outputs.skip == 'false' }}"
153+
uses: ./.github/actions/test_gem
154+
with:
155+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
156+
ruby: "jruby-10.0.2.0"

0 commit comments

Comments
 (0)