Skip to content

Commit edd7bff

Browse files
kaylareopellekaylareopelle
authored
Merge branch 'dev' into extend-missing-tracestate-header-sampling-to-otel
2 parents eb76e56 + 5e6d086 commit edd7bff

File tree

300 files changed

+1378
-7334
lines changed

Some content is hidden

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

300 files changed

+1378
-7334
lines changed

‎.github/actions/run_multiverse/action.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ runs:
1919
using: "composite"
2020
steps:
2121
# - curl is needed for Curb
22-
# - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
2322
# - sasl is needed for memcached
2423
- name: Install OS packages
2524
shell: bash
2625
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2726

2827
- name: Install Ruby ${{ inputs.ruby-version }}
29-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
28+
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
3029
with:
3130
ruby-version: ${{ inputs.ruby-version }}
3231

‎.github/actions/run_perfverse/action.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ inputs:
55
description: 'What agent version to install'
66
required: true
77
agent_env_vars:
8-
description: ''
8+
description: ''
99
required: false
10-
run_time:
11-
description: ''
10+
run_time:
11+
description: ''
1212
required: true
13-
nr_license_key:
14-
description: ''
13+
nr_license_key:
14+
description: ''
1515
required: true
16-
test_tag:
17-
description: ''
16+
test_tag:
17+
description: ''
1818
required: true
19-
docker_monitor_output_dir:
20-
description: ''
19+
docker_monitor_output_dir:
20+
description: ''
2121
required: true
2222
default: docker_monitor_output
2323
run_label:
24-
description: ''
24+
description: ''
2525
required: true
2626
iterations:
2727
description: ''
@@ -32,15 +32,15 @@ runs:
3232
using: "composite"
3333
steps:
3434
- name: Install Ruby
35-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
35+
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
3636
with:
3737
ruby-version: 3.4
3838

3939
- name: Run ruby script
4040
shell: bash
4141
run: |
4242
ruby ./.github/workflows/scripts/run_perf_tests.rb
43-
env:
43+
env:
4444
AGENT_TAG: ${{ inputs.agent_tag }}
4545
TEST_TAG: ${{ inputs.test_tag }}
4646
RUN_TIME: ${{ inputs.run_time }}

‎.github/actions/run_unit_tests/action.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ runs:
1313
using: "composite"
1414
steps:
1515
# - curl is needed for Curb
16-
# - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
1716
# - sasl is needed for memcached
1817
- name: Install OS packages
1918
shell: bash
2019
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2120

2221
- name: Install Ruby ${{ inputs.ruby-version }}
23-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
22+
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
2423
with:
2524
ruby-version: ${{ inputs.ruby-version }}
2625

@@ -30,12 +29,6 @@ runs:
3029
key: ${{ inputs.ruby-version }}
3130
map: |
3231
{
33-
"2.4.10": {
34-
"rails": "norails,rails52,rails51,rails50,rails42,rails41,rails40"
35-
},
36-
"2.5.9": {
37-
"rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
38-
},
3932
"2.6.10": {
4033
"rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
4134
},
@@ -56,6 +49,9 @@ runs:
5649
},
5750
"3.4.4": {
5851
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
52+
},
53+
"4.0.0-preview2": {
54+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5955
}
6056
}
6157

‎.github/actions/setup_mysql_tests/action.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,6 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
# This allows the cache in the following step to be able to write files to the directory needed for mysql
12-
- if: inputs.ruby-version == '2.4.10'
13-
name: Prepare mysql directory
14-
shell: bash
15-
run: sudo chown -R $USER /usr/local
16-
17-
- if: inputs.ruby-version == '2.4.10'
18-
name: Cache mysql55
19-
id: mysql55-cache
20-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
21-
with:
22-
path: /usr/local/mysql55
23-
key: mysql55-install
24-
25-
- if: steps.mysql55-cache.outputs.cache-hit != 'true' && inputs.ruby-version == '2.4.10'
26-
name: Install mysql55
27-
shell: bash
28-
run: sudo ./test/script/install_mysql55
29-
3011
- name: Wait for/Check Mysql
3112
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # tag v3.0.2
3213
with:

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
1717
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
1818
with:
19-
ruby-version: 3.4
20-
- run: bundle
19+
ruby-version: 4.0.0-preview2
20+
- run: bundle install
2121
- run: rubocop
2222

2323

@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
ruby-version: [2.4.10, 3.4.4]
39+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
4040
steps:
4141
- name: Configure git
4242
run: 'git config --global init.defaultBranch main'
@@ -56,7 +56,7 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
multiverse: [agent, ai, background, background_2, frameworks, httpclients, httpclients_2, hybrid_agent, rails, rest]
59-
ruby-version: [2.4.10, 3.4.4]
59+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
6060
steps:
6161
- name: Configure git
6262
run: 'git config --global init.defaultBranch main'
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-22.04
7575
services:
7676
mongodb:
77-
image: ${{ contains(fromJson('["2.4.10"]'), matrix.ruby-version) && 'mongo:5.0.11' || 'mongo:latest' }}
77+
image: mongo:latest
7878
ports:
7979
- 27017:27017
8080
rabbitmq:
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
fail-fast: false
9191
matrix:
92-
ruby-version: [2.4.10, 3.4.4]
92+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
9393
steps:
9494
- name: Configure git
9595
run: 'git config --global init.defaultBranch main'
@@ -139,7 +139,7 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
ruby-version: [2.4.10, 3.4.4]
142+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
143143
steps:
144144
- name: Configure git
145145
run: 'git config --global init.defaultBranch main'
@@ -182,7 +182,7 @@ jobs:
182182
strategy:
183183
fail-fast: false
184184
matrix:
185-
ruby-version: [2.4.10, 3.4.4]
185+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
186186
steps:
187187
- name: Configure git
188188
run: 'git config --global init.defaultBranch main'
@@ -229,7 +229,7 @@ jobs:
229229
strategy:
230230
fail-fast: false
231231
matrix:
232-
ruby-version: [2.4.10, 3.4.4]
232+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
233233
steps:
234234
- name: Configure git
235235
run: 'git config --global init.defaultBranch main'
@@ -268,7 +268,7 @@ jobs:
268268
strategy:
269269
fail-fast: false
270270
matrix:
271-
ruby-version: [2.4.10, 3.4.4]
271+
ruby-version: [2.6.10, 3.4.4, 4.0.0-preview2]
272272
steps:
273273
- name: Configure git
274274
run: 'git config --global init.defaultBranch main'
@@ -312,8 +312,8 @@ jobs:
312312
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
313313
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
314314
with:
315-
ruby-version: 3.4
316-
- run: bundle
315+
ruby-version: 4.0.0-preview2
316+
- run: bundle install
317317
- name: Download all workflow run artifacts
318318
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag v6.0.0
319319
- name: Collate Coverage Results

‎.github/workflows/ci_cron.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
1919
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
2020
with:
21-
ruby-version: 3.4
22-
- run: bundle
21+
ruby-version: 4.0.0-preview2
22+
- run: bundle install
2323
- run: rubocop
2424

2525

@@ -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.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
39+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
4040
steps:
4141
- name: Configure git
4242
run: 'git config --global init.defaultBranch main'
@@ -54,7 +54,7 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
multiverse: [agent, ai, background, background_2, frameworks, httpclients, httpclients_2, hybrid_agent, rails, rest]
57-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
57+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
5858
steps:
5959
- name: Configure git
6060
run: 'git config --global init.defaultBranch main'
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-22.04
7474
services:
7575
mongodb:
76-
image: ${{ contains(fromJson('["2.4.10"]'), matrix.ruby-version) && 'mongo:5.0.11' || 'mongo:latest' }}
76+
image: mongo:latest
7777
ports:
7878
- 27017:27017
7979
rabbitmq:
@@ -88,7 +88,7 @@ jobs:
8888
strategy:
8989
fail-fast: false
9090
matrix:
91-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
91+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
9292
steps:
9393
- name: Configure git
9494
run: 'git config --global init.defaultBranch main'
@@ -139,7 +139,8 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
142+
# TODO: Add Ruby 4.0.0 testing; redis-clustering gem not currently compatible
143+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
143144
steps:
144145
- name: Configure git
145146
run: 'git config --global init.defaultBranch main'
@@ -183,7 +184,7 @@ jobs:
183184
strategy:
184185
fail-fast: false
185186
matrix:
186-
ruby-version: [2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
187+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
187188
steps:
188189
- name: Configure git
189190
run: 'git config --global init.defaultBranch main'
@@ -231,7 +232,7 @@ jobs:
231232
strategy:
232233
fail-fast: false
233234
matrix:
234-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
235+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
235236
steps:
236237
- name: Configure git
237238
run: 'git config --global init.defaultBranch main'
@@ -272,7 +273,7 @@ jobs:
272273
strategy:
273274
fail-fast: false
274275
matrix:
275-
ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
276+
ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 4.0.0-preview2]
276277
steps:
277278
- name: Configure git
278279
run: 'git config --global init.defaultBranch main'
@@ -291,7 +292,8 @@ jobs:
291292
strategy:
292293
fail-fast: false
293294
matrix:
294-
ruby-version: [2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
295+
# TODO: Add Ruby 4.0.0 testing; grpc gem not currently compatible
296+
ruby-version: [2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
295297
steps:
296298
- name: Configure git
297299
run: 'git config --global init.defaultBranch main'

‎.github/workflows/config_docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Checkout code
2323
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
2424

25-
- run: bundle
25+
- run: bundle install
2626

2727
- name: Generate config doc
2828
run: bundle exec rake newrelic:config:docs[html]

‎.github/workflows/lambda_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424

25-
- run: bundle
25+
- run: bundle install
2626

2727
- name: Set agent version
2828
run: echo "agent_version=$(bundle exec rake newrelic:version:current)" >> $GITHUB_ENV

‎.github/workflows/performance_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
3737
with:
3838
ruby-version: 3.4
39-
- run: bundle
39+
- run: bundle install
4040
- run: bundle exec script/runner -B
4141
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
4242
- run: bundle

‎.github/workflows/prerelease.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout code
1919
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
2020

21-
- run: bundle
21+
- run: bundle install
2222

2323
- name: Update files with new version
2424
run: bundle exec rake newrelic:version:bump

0 commit comments

Comments
 (0)