Skip to content

Commit e223219

Browse files
committed
Merge branch 'main' into net_http_semconv_stability_opt_in
2 parents 5f7fc25 + 9e8fe43 commit e223219

File tree

77 files changed

+113
-106
lines changed

Some content is hidden

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

77 files changed

+113
-106
lines changed

.instrumentation_generator/templates/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :test do
2020
gem 'opentelemetry-sdk', '~> 1.0'
2121
gem 'opentelemetry-test-helpers', '~> 0.3'
2222
gem 'rake', '~> 13.0'
23-
gem 'rubocop', '~> 1.75.1'
23+
gem 'rubocop', '~> 1.76.2'
2424
gem 'rubocop-performance', '~> 1.24.0'
2525
gem 'simplecov', '~> 0.17.1'
2626
gem 'webmock', '~> 3.24'

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
source 'https://rubygems.org'
88

99
gem 'rake', '~> 13.0'
10-
gem 'rubocop', '~> 1.75.1'
10+
gem 'rubocop', '~> 1.76.2'
1111
gem 'rubocop-performance', '~> 1.24.0'

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,9 @@ requests.
2525
The Ruby special interest group (SIG) meets regularly. See the OpenTelemetry
2626
[community page][ruby-sig] repo for information on this and other language SIGs.
2727

28-
Approvers ([@open-telemetry/ruby-contrib-approvers](https://github.com/orgs/open-telemetry/teams/ruby-contrib-approvers)):
29-
30-
- [Josef Šimánek](https://github.com/simi)
31-
- [Xuan Cao](https://github.com/xuan-cao-swi), Solarwinds
32-
33-
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).*
34-
35-
Maintainers ([@open-telemetry/ruby-contrib-maintainers](https://github.com/orgs/open-telemetry/teams/ruby-contrib-maintainers)):
28+
### Maintainers
3629

30+
- [Andrew Hayworth](https://github.com/ahayworth)
3731
- [Ariel Valentin](https://github.com/arielvalentin), GitHub
3832
- [Daniel Azuma](https://github.com/dazuma), Google
3933
- [Eric Mustin](https://github.com/ericmustin)
@@ -44,7 +38,14 @@ Maintainers ([@open-telemetry/ruby-contrib-maintainers](https://github.com/orgs/
4438
- [Robert Laurin](https://github.com/robertlaurin), Shopify
4539
- [Sam Handler](https://github.com/plantfansam), Shopify
4640

47-
*Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).*
41+
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
42+
43+
### Approvers
44+
45+
- [Josef Šimánek](https://github.com/simi)
46+
- [Xuan Cao](https://github.com/xuan-cao-swi), Solarwinds
47+
48+
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
4849

4950
## Instrumentation Libraries
5051

helpers/mysql/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group :test do
1313
gem 'minitest', '~> 5.0'
1414
gem 'opentelemetry-test-helpers', '~> 0.3'
1515
gem 'rake', '~> 13.0'
16-
gem 'rubocop', '~> 1.75.1'
16+
gem 'rubocop', '~> 1.76.2'
1717
gem 'rubocop-performance', '~> 1.24.0'
1818
gem 'simplecov', '~> 0.22.0'
1919
gem 'yard', '~> 0.9'

helpers/sql-obfuscation/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group :test do
1313
gem 'minitest', '~> 5.0'
1414
gem 'opentelemetry-test-helpers', '~> 0.3'
1515
gem 'rake', '~> 13.0'
16-
gem 'rubocop', '~> 1.75.1'
16+
gem 'rubocop', '~> 1.76.2'
1717
gem 'rubocop-performance', '~> 1.24.0'
1818
gem 'simplecov', '~> 0.22.0'
1919
gem 'yard', '~> 0.9'

helpers/sql/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ group :test do
1818
gem 'minitest', '~> 5.0'
1919
gem 'opentelemetry-test-helpers', '~> 0.3'
2020
gem 'rake', '~> 13.0'
21-
gem 'rubocop', '~> 1.75.1'
21+
gem 'rubocop', '~> 1.76.2'
2222
gem 'rubocop-performance', '~> 1.24.0'
2323
gem 'simplecov', '~> 0.22.0'
2424
gem 'yard', '~> 0.9'

instrumentation/action_mailer/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ group :test do
1515
gem 'opentelemetry-sdk', '~> 1.1'
1616
gem 'opentelemetry-test-helpers', '~> 0.3'
1717
gem 'rake', '~> 13.0'
18-
gem 'rubocop', '~> 1.75.1'
18+
gem 'rubocop', '~> 1.76.2'
1919
gem 'rubocop-performance', '~> 1.24.0'
2020
gem 'simplecov', '~> 0.22.0'
2121
gem 'webmock', '~> 3.24'

instrumentation/action_pack/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ group :test do
1515
gem 'opentelemetry-sdk', '~> 1.1'
1616
gem 'opentelemetry-test-helpers', '~> 0.3'
1717
gem 'rake', '~> 13.0'
18-
gem 'rubocop', '~> 1.75.1'
18+
gem 'rubocop', '~> 1.76.2'
1919
gem 'rubocop-performance', '~> 1.24.0'
2020
gem 'simplecov', '~> 0.22.0'
2121
gem 'webmock', '~> 3.24'

instrumentation/action_view/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ group :test do
1515
gem 'opentelemetry-sdk', '~> 1.1'
1616
gem 'opentelemetry-test-helpers', '~> 0.3'
1717
gem 'rake', '~> 13.0'
18-
gem 'rubocop', '~> 1.75.1'
18+
gem 'rubocop', '~> 1.76.2'
1919
gem 'rubocop-performance', '~> 1.24.0'
2020
gem 'simplecov', '~> 0.22.0'
2121
gem 'webmock', '~> 3.24'

instrumentation/active_job/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ group :test do
1515
gem 'opentelemetry-sdk', '~> 1.1'
1616
gem 'opentelemetry-test-helpers', '~> 0.3'
1717
gem 'rake', '~> 13.0'
18-
gem 'rubocop', '~> 1.75.1'
18+
gem 'rubocop', '~> 1.76.2'
1919
gem 'rubocop-performance', '~> 1.24.0'
2020
gem 'simplecov', '~> 0.22.0'
2121
gem 'webmock', '~> 3.24'

0 commit comments

Comments
 (0)