Skip to content

Commit 2b7b59f

Browse files
Merge branch 'main' into ci/appraisal_support
2 parents 3862d40 + 59d196a commit 2b7b59f

File tree

295 files changed

+7366
-6650
lines changed

Some content is hidden

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

295 files changed

+7366
-6650
lines changed

.cspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ words:
8686
- linkspector
8787
- sarif
8888
- bigdecimal
89+
- confluentinc

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ NOTE: Please use this form to submit bugs or demonstrations of non spec complian
1212
1313
-->
1414

15-
**Description of the bug**
15+
## Description of the bug
1616

1717
<!--
1818
@@ -21,14 +21,14 @@ what happened and what you expected with a link to the relevant portion of the s
2121
2222
-->
2323

24-
**Share details about your runtime**
24+
## Share details about your runtime
2525

2626
Operating system details: Linux, Ubuntu 20.04 LTS
2727
RUBY_ENGINE: "ruby"
2828
RUBY_VERSION: "3.4"
2929
RUBY_DESCRIPTION: "ruby 3.4.1 (2024-12-25 revision 48d4efcb85) arm64-darwin21]"
3030

31-
**Share a simplified reproduction if possible**
31+
## Share a simplified reproduction if possible
3232

3333
```rb
3434
require 'bundler/inline'

.github/actions/test_gem/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ runs:
8484
# ...but not for appraisals, sadly.
8585
- name: Install Ruby ${{ inputs.ruby }} with dependencies
8686
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
87-
uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
87+
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
8888
with:
8989
ruby-version: "${{ inputs.ruby }}"
9090
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -94,7 +94,7 @@ runs:
9494
# If we're using appraisals, do it all manually.
9595
- name: Install Ruby ${{ inputs.ruby }} without dependencies
9696
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
97-
uses: ruby/setup-ruby@675dd7ba1b06c8786a1480d89c384f5620a42647 # v1.281.0
97+
uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
9898
with:
9999
ruby-version: "${{ inputs.ruby }}"
100100
working-directory: "${{ steps.setup.outputs.gem_dir }}"

.github/component_owners.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ components:
77
instrumentation/aws_sdk:
88
- jterapin
99
- alextwoods
10-
- NathanielRN
1110
instrumentation/factory_bot:
1211
- americodls
1312
instrumentation/grape:
@@ -36,7 +35,15 @@ components:
3635
processor/baggage:
3736
- robbkidd
3837
- mikegoldsmith
38+
resources/aws:
39+
- jterapin
40+
- alextwoods
41+
- NathanielRN
42+
- xuan-cao-swi
3943
resources/container:
4044
- scbjans
4145
sampler/xray:
46+
- jterapin
47+
- alextwoods
48+
- NathanielRN
4249
- jj22ee

.github/labeler.yml

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
ci:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- ".github/**"
5+
6+
helpers-mysql:
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- "helpers/mysql/**"
10+
helpers-sql:
11+
- changed-files:
12+
- any-glob-to-any-file:
13+
- "helpers/sql/**"
14+
helpers-sql-obfuscation:
15+
- changed-files:
16+
- any-glob-to-any-file:
17+
- "helpers/sql-obfuscation/**"
18+
helpers-sql-processor:
19+
- changed-files:
20+
- any-glob-to-any-file:
21+
- "helpers/sql-processor/**"
22+
23+
instrumentation-action_mailer:
24+
- changed-files:
25+
- any-glob-to-any-file:
26+
- "instrumentation/action_mailer/**"
27+
instrumentation-action_pack:
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- "instrumentation/action_pack/**"
31+
instrumentation-action_view:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- "instrumentation/action_view/**"
35+
instrumentation-active_job:
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- "instrumentation/active_job/**"
39+
instrumentation-active_model_serializers:
40+
- changed-files:
41+
- any-glob-to-any-file:
42+
- "instrumentation/active_model_serializers/**"
43+
instrumentation-active_record:
44+
- changed-files:
45+
- any-glob-to-any-file:
46+
- "instrumentation/active_record/**"
47+
instrumentation-active_storage:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- "instrumentation/active_storage/**"
51+
instrumentation-active_support:
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
- "instrumentation/active_support/**"
55+
instrumentation-anthropic:
56+
- changed-files:
57+
- any-glob-to-any-file:
58+
- "instrumentation/anthropic/**"
59+
instrumentation-aws_sdk:
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
- "instrumentation/aws_sdk/**"
63+
instrumentation-aws_lambda:
64+
- changed-files:
65+
- any-glob-to-any-file:
66+
- "instrumentation/aws_lambda/**"
67+
instrumentation-base:
68+
- changed-files:
69+
- any-glob-to-any-file:
70+
- "instrumentation/base/**"
71+
instrumentation-bunny:
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- "instrumentation/bunny/**"
75+
instrumentation-concurrent_ruby:
76+
- changed-files:
77+
- any-glob-to-any-file:
78+
- "instrumentation/concurrent_ruby/**"
79+
instrumentation-dalli:
80+
- changed-files:
81+
- any-glob-to-any-file:
82+
- "instrumentation/dalli/**"
83+
instrumentation-delayed_job:
84+
- changed-files:
85+
- any-glob-to-any-file:
86+
- "instrumentation/delayed_job/**"
87+
instrumentation-ethon:
88+
- changed-files:
89+
- any-glob-to-any-file:
90+
- "instrumentation/ethon/**"
91+
instrumentation-excon:
92+
- changed-files:
93+
- any-glob-to-any-file:
94+
- "instrumentation/excon/**"
95+
instrumentation-factory_bot:
96+
- changed-files:
97+
- any-glob-to-any-file:
98+
- "instrumentation/factory_bot/**"
99+
instrumentation-faraday:
100+
- changed-files:
101+
- any-glob-to-any-file:
102+
- "instrumentation/faraday/**"
103+
instrumentation-grape:
104+
- changed-files:
105+
- any-glob-to-any-file:
106+
- "instrumentation/grape/**"
107+
instrumentation-graphql:
108+
- changed-files:
109+
- any-glob-to-any-file:
110+
- "instrumentation/graphql/**"
111+
instrumentation-grpc:
112+
- changed-files:
113+
- any-glob-to-any-file:
114+
- "instrumentation/grpc/**"
115+
instrumentation-gruf:
116+
- changed-files:
117+
- any-glob-to-any-file:
118+
- "instrumentation/gruf/**"
119+
instrumentation-http:
120+
- changed-files:
121+
- any-glob-to-any-file:
122+
- "instrumentation/http/**"
123+
instrumentation-http_client:
124+
- changed-files:
125+
- any-glob-to-any-file:
126+
- "instrumentation/http_client/**"
127+
instrumentation-httpx:
128+
- changed-files:
129+
- any-glob-to-any-file:
130+
- "instrumentation/httpx/**"
131+
instrumentation-koala:
132+
- changed-files:
133+
- any-glob-to-any-file:
134+
- "instrumentation/koala/**"
135+
instrumentation-lmdb:
136+
- changed-files:
137+
- any-glob-to-any-file:
138+
- "instrumentation/lmdb/**"
139+
instrumentation-logger:
140+
- changed-files:
141+
- any-glob-to-any-file:
142+
- "instrumentation/logger/**"
143+
instrumentation-mongo:
144+
- changed-files:
145+
- any-glob-to-any-file:
146+
- "instrumentation/mongo/**"
147+
instrumentation-mysql2:
148+
- changed-files:
149+
- any-glob-to-any-file:
150+
- "instrumentation/mysql2/**"
151+
instrumentation-net_http:
152+
- changed-files:
153+
- any-glob-to-any-file:
154+
- "instrumentation/net_http/**"
155+
instrumentation-net_ldap:
156+
- changed-files:
157+
- any-glob-to-any-file:
158+
- "instrumentation/net_ldap/**"
159+
instrumentation-pg:
160+
- changed-files:
161+
- any-glob-to-any-file:
162+
- "instrumentation/pg/**"
163+
instrumentation-que:
164+
- changed-files:
165+
- any-glob-to-any-file:
166+
- "instrumentation/que/**"
167+
instrumentation-racecar:
168+
- changed-files:
169+
- any-glob-to-any-file:
170+
- "instrumentation/racecar/**"
171+
instrumentation-rack:
172+
- changed-files:
173+
- any-glob-to-any-file:
174+
- "instrumentation/rack/**"
175+
instrumentation-rails:
176+
- changed-files:
177+
- any-glob-to-any-file:
178+
- "instrumentation/rails/**"
179+
instrumentation-rdkafka:
180+
- changed-files:
181+
- any-glob-to-any-file:
182+
- "instrumentation/rdkafka/**"
183+
instrumentation-redis:
184+
- changed-files:
185+
- any-glob-to-any-file:
186+
- "instrumentation/redis/**"
187+
instrumentation-resque:
188+
- changed-files:
189+
- any-glob-to-any-file:
190+
- "instrumentation/resque/**"
191+
instrumentation-restclient:
192+
- changed-files:
193+
- any-glob-to-any-file:
194+
- "instrumentation/restclient/**"
195+
instrumentation-respec:
196+
- changed-files:
197+
- any-glob-to-any-file:
198+
- "instrumentation/rspec/**"
199+
instrumentation-ruby_kafka:
200+
- changed-files:
201+
- any-glob-to-any-file:
202+
- "instrumentation/ruby_kafka/**"
203+
instrumentation-sidekiq:
204+
- changed-files:
205+
- any-glob-to-any-file:
206+
- "instrumentation/sidekiq/**"
207+
instrumentation-sinatra:
208+
- changed-files:
209+
- any-glob-to-any-file:
210+
- "instrumentation/sinatra/**"
211+
instrumentation-trilogy:
212+
- changed-files:
213+
- any-glob-to-any-file:
214+
- "instrumentation/trilogy/**"
215+
216+
processor-baggage:
217+
- changed-files:
218+
- any-glob-to-any-file:
219+
- "processor/baggage/**"
220+
221+
propagator-google_cloud_trace_context:
222+
- changed-files:
223+
- any-glob-to-any-file:
224+
- "propagator/google_cloud_trace_context/**"
225+
propagator-ottrace:
226+
- changed-files:
227+
- any-glob-to-any-file:
228+
- "propagator/ottrace/**"
229+
propagator-vitess:
230+
- changed-files:
231+
- any-glob-to-any-file:
232+
- "propagator/vitess/**"
233+
propagator-xray:
234+
- changed-files:
235+
- any-glob-to-any-file:
236+
- "propagator/xray/**"
237+
238+
resource-detector-aws:
239+
- changed-files:
240+
- any-glob-to-any-file:
241+
- "resources/aws/**"
242+
resource-detector-azure:
243+
- changed-files:
244+
- any-glob-to-any-file:
245+
- "resources/azure/**"
246+
resource-detector-container:
247+
- changed-files:
248+
- any-glob-to-any-file:
249+
- "resources/container/**"
250+
resource-detector-google_cloud_platform:
251+
- changed-files:
252+
- any-glob-to-any-file:
253+
- "resources/google_cloud_platform/**"
254+
255+
sampler-xray:
256+
- changed-files:
257+
- any-glob-to-any-file:
258+
- "sampler/xray/**"

0 commit comments

Comments
 (0)