Skip to content

Commit d4a9102

Browse files
kaylareopellekaylareopelle
authored
Merge pull request #2661 from newrelic/dev
Release 9.10.0
2 parents ccde782 + 687f59a commit d4a9102

Some content is hidden

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

56 files changed

+1043
-230
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Configure git
1515
run: 'git config --global init.defaultBranch main'
1616
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
17-
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
17+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1818
with:
1919
ruby-version: '3.3'
2020
- run: bundle
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
ruby-version: [2.4.10, 3.3.0]
39+
ruby-version: [2.4.10, 3.3.1]
4040
steps:
4141
- name: Configure git
4242
run: 'git config --global init.defaultBranch main'
@@ -49,7 +49,7 @@ jobs:
4949
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
5050

5151
- name: Install Ruby ${{ matrix.ruby-version }}
52-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
52+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
5353
with:
5454
ruby-version: ${{ matrix.ruby-version }}
5555

@@ -62,7 +62,7 @@ jobs:
6262
"2.4.10": {
6363
"rails": "norails,rails42,rails52"
6464
},
65-
"3.3.0": {
65+
"3.3.1": {
6666
"rails": "norails,rails61,rails70"
6767
}
6868
}
@@ -190,7 +190,7 @@ jobs:
190190
fail-fast: false
191191
matrix:
192192
multiverse: [agent, ai, background, background_2, database, frameworks, httpclients, httpclients_2, rails, rest]
193-
ruby-version: [2.4.10, 3.3.0]
193+
ruby-version: [2.4.10, 3.3.1]
194194

195195
steps:
196196
- name: Configure git
@@ -204,7 +204,7 @@ jobs:
204204
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
205205

206206
- name: Install Ruby ${{ matrix.ruby-version }}
207-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
207+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
208208
with:
209209
ruby-version: ${{ matrix.ruby-version }}
210210

@@ -290,14 +290,14 @@ jobs:
290290
strategy:
291291
fail-fast: false
292292
matrix:
293-
ruby-version: [2.7.8, 3.3.0]
293+
ruby-version: [2.7.8, 3.3.1]
294294
steps:
295295
- name: Configure git
296296
run: 'git config --global init.defaultBranch main'
297297
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
298298

299299
- name: Install Ruby ${{ matrix.ruby-version }}
300-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
300+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
301301
with:
302302
ruby-version: ${{ matrix.ruby-version }}
303303

@@ -337,9 +337,9 @@ jobs:
337337
- name: Configure git
338338
run: 'git config --global init.defaultBranch main'
339339
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
340-
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
340+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
341341
with:
342-
ruby-version: '3.1'
342+
ruby-version: '3.3'
343343
- run: bundle
344344
- name: Download all workflow run artifacts
345345
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # tag v3.0.2

‎.github/workflows/ci_cron.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
- name: Configure git
1717
run: 'git config --global init.defaultBranch main'
1818
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
19-
- uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
19+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
2020
with:
21-
ruby-version: '3.2'
21+
ruby-version: '3.3'
2222
- run: bundle
2323
- run: rubocop
2424

@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
39+
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
4040

4141
steps:
4242
- name: Configure git
@@ -50,7 +50,7 @@ jobs:
5050
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
5151

5252
- name: Install Ruby ${{ matrix.ruby-version }}
53-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
53+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
5454
with:
5555
ruby-version: ${{ matrix.ruby-version }}
5656

@@ -72,17 +72,17 @@ jobs:
7272
"2.7.8": {
7373
"rails": "norails,rails61,rails60,rails70"
7474
},
75-
"3.0.6": {
75+
"3.0.7": {
7676
"rails": "norails,rails61,rails60,rails70"
7777
},
78-
"3.1.4": {
79-
"rails": "norails,rails61,rails70,railsedge"
78+
"3.1.5": {
79+
"rails": "norails,rails61,rails70"
8080
},
81-
"3.2.2": {
82-
"rails": "norails,rails61,rails70,railsedge"
81+
"3.2.4": {
82+
"rails": "norails,rails61,rails70"
8383
},
84-
"3.3.0": {
85-
"rails": "norails,rails61,rails70,railsedge"
84+
"3.3.1": {
85+
"rails": "norails,rails61,rails70"
8686
}
8787
}
8888
@@ -200,7 +200,7 @@ jobs:
200200
fail-fast: false
201201
matrix:
202202
multiverse: [agent, ai, background, background_2, database, frameworks, httpclients, httpclients_2, rails, rest]
203-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
203+
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
204204
steps:
205205
- name: Configure git
206206
run: 'git config --global init.defaultBranch main'
@@ -213,7 +213,7 @@ jobs:
213213
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
214214

215215
- name: Install Ruby ${{ matrix.ruby-version }}
216-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
216+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
217217
with:
218218
ruby-version: ${{ matrix.ruby-version }}
219219

@@ -278,14 +278,14 @@ jobs:
278278
strategy:
279279
fail-fast: false
280280
matrix:
281-
ruby-version: [2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
281+
ruby-version: [2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
282282
steps:
283283
- name: Configure git
284284
run: 'git config --global init.defaultBranch main'
285285
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
286286

287287
- name: Install Ruby ${{ matrix.ruby-version }}
288-
uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
288+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
289289
with:
290290
ruby-version: ${{ matrix.ruby-version }}
291291

‎.github/workflows/ci_jruby.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
1717

1818
- name: Install JRuby
19-
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
19+
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # tag v1.176.0
2020
with:
21-
ruby-version: jruby-9.4.5.0
21+
ruby-version: jruby-9.4.7.0
2222

2323
- name: Bundle
2424
run: bundle install
@@ -49,9 +49,9 @@ jobs:
4949
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
5050

5151
- name: Install JRuby
52-
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
52+
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # tag v1.176.0
5353
with:
54-
ruby-version: jruby-9.4.5.0
54+
ruby-version: jruby-9.4.7.0
5555

5656
- name: Bundle
5757
run: bundle install

‎.github/workflows/config_docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
contents: write
1515
pull-requests: write
1616
steps:
17-
- name: Install Ruby 3.2
18-
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
17+
- name: Install Ruby 3.3
18+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1919
with:
20-
ruby-version: 3.2
20+
ruby-version: 3.3
2121

2222
- name: Checkout code
2323
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

‎.github/workflows/performance_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
3434
with:
3535
ref: 'main'
36-
- uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
36+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
3737
with:
38-
ruby-version: '3.2'
38+
ruby-version: '3.3'
3939
- run: bundle
4040
- run: bundle exec script/runner -B
4141
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

‎.github/workflows/prerelease.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
contents: write
1111
pull-requests: write
1212
steps:
13-
- name: Install Ruby 3.2
14-
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
13+
- name: Install Ruby 3.3
14+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1515
with:
16-
ruby-version: 3.2
16+
ruby-version: 3.3
1717

1818
- name: Checkout code
1919
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818

19-
- uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
19+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
2020
with:
21-
ruby-version: 3.2
21+
ruby-version: 3.3
2222

2323
- name: Install onetimepass
2424
run: pip install onetimepass==1.0.1

‎.github/workflows/release_notes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
contents: write
1414
pull-requests: write
1515
steps:
16-
- uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
16+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1717
with:
18-
ruby-version: 3.2
18+
ruby-version: 3.3
1919
- name: Checkout code
2020
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
2121

‎.github/workflows/release_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
contents: write
1414
pull-requests: write
1515
steps:
16-
- name: Install Ruby 3.2
17-
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
16+
- name: Install Ruby 3.3
17+
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1818
with:
19-
ruby-version: 3.2
19+
ruby-version: 3.3
2020

2121
- name: Checkout code
2222
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

‎.github/workflows/scripts/setup_bundler

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ function using_old_ruby {
2020
# '2.7.7' => false, starts with "2", next digit is "7"
2121
# '3.1.3' => false, does not start with "2"
2222
echo "DEBUG: RUBY_VERSION = $RUBY_VERSION"
23-
[[ $RUBY_VERSION =~ 2.[^67] ]]
23+
[[ $RUBY_VERSION =~ ^2\.[^67] ]]
2424
}
2525

2626
function update_to_desired_rubygems_version {
2727
# Older rubies come with older Rubygems and we need 3.0.6 to
2828
# correctly install Bundler 1.17 for the multiverse test suite
2929
# Rubies < 2.3 need to use update_rubygems,
3030
# newer Rubies can use 'gem update --system'
31-
if [[ $RUBY_VERSION =~ 2.[^7] ]]; then
31+
if [[ $RUBY_VERSION =~ ^2\.[^7] ]]; then
3232
echo "DEBUG: running 'gem update --system 3.0.6 --force'"
3333
gem update --system 3.0.6 --force >/dev/null
3434
else
@@ -58,7 +58,7 @@ function install_desired_bundler_version {
5858
}
5959

6060
function configure_bundler {
61-
if ! [[ $RUBY_VERSION =~ 2.4 ]]; then
61+
if ! [[ $RUBY_VERSION =~ ^2\.4 ]]; then
6262
echo "DEBUG: Ruby is not at version 2.4.x, skipping 'bundler config'"
6363
return
6464
fi
@@ -75,14 +75,14 @@ function install_ruby_version_specific_gems {
7575
fi
7676

7777
# for some reason, ruby 3.0 fails unless 3.1.0 is installed before it bundles for rails_prepend suite/rails 7
78-
if [[ $RUBY_VERSION =~ 3.0 ]]; then
78+
if [[ $RUBY_VERSION =~ ^3\.0 ]]; then
7979
echo "DEBUG: running 'gem install digest'"
8080
gem install --default digest:3.1.0
8181
echo "installed digest 3.1.0"
8282
fi
8383

8484
# for some reason, ruby 2.7+ fails unless strscan 3.0.4 is installed
85-
if [[ $RUBY_VERSION = 3.* || $RUBY_VERSION =~ 2.7 ]]; then
85+
if [[ $RUBY_VERSION =~ ^3\. || $RUBY_VERSION =~ ^2\.7 ]]; then
8686
echo "DEBUG: running 'gem install strscan'"
8787
gem install --default strscan:3.0.4
8888
echo "installed strscan 3.0.4"

‎.github/workflows/slack_notifications.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
gem_notifications:
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
11+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
1212
with:
13-
ruby-version: 3.2
13+
ruby-version: 3.3
1414
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
1515
- run: gem install httparty
1616
- name: Check for outdated gems
@@ -45,9 +45,9 @@ jobs:
4545
cve_notifications:
4646
runs-on: ubuntu-22.04
4747
steps:
48-
- uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
48+
- uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
4949
with:
50-
ruby-version: 3.2
50+
ruby-version: 3.3
5151
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
5252
- run: gem install httparty
5353
- run: gem install feedjira

‎.github/workflows/snyk.yml

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

‎.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,7 @@ Style/MethodCallWithArgsParentheses:
12501250
- add_development_dependency
12511251
- catch
12521252
- debug
1253+
- exit
12531254
- expect
12541255
- fail
12551256
- gem
@@ -1260,6 +1261,7 @@ Style/MethodCallWithArgsParentheses:
12601261
- pp
12611262
- raise
12621263
- require
1264+
- require_relative
12631265
- skip
12641266
- sleep
12651267
- source
@@ -1268,6 +1270,7 @@ Style/MethodCallWithArgsParentheses:
12681270
- throw
12691271
- use
12701272
- warn
1273+
- warn_and_exit
12711274
AllowedPatterns: [^assert, ^refute]
12721275

12731276
Style/MethodCallWithoutArgsParentheses:

0 commit comments

Comments
 (0)