Skip to content

Commit afe8452

Browse files
kaylareopellekaylareopelle
committed
Merge branch 'dev' into request-uri
2 parents c8debd4 + bb90edd commit afe8452

File tree

13 files changed

+213
-138
lines changed

13 files changed

+213
-138
lines changed

‎.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- if: matrix.ruby-version == '2.4.10'
7575
name: Cache mysql55
7676
id: mysql55-cache
77-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # tag v4.2.2
77+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
7878
with:
7979
path: /usr/local/mysql55
8080
key: mysql55-install
@@ -103,7 +103,7 @@ jobs:
103103
CI_FOR_PR: true
104104

105105
- name: Save coverage results
106-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
106+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
107107
with:
108108
name: coverage-report-unit-tests-${{ matrix.ruby-version }}-${{ env.rails }}
109109
path: lib/coverage_*/.resultset.json
@@ -157,7 +157,7 @@ jobs:
157157
uses: ./.github/actions/annotate
158158

159159
- name: Save coverage results
160-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
161161
with:
162162
name: coverage-report-multiverse-${{ matrix.ruby-version }}-${{ matrix.multiverse }}
163163
path: lib/coverage_*/.resultset.json
@@ -168,7 +168,7 @@ jobs:
168168
run: rake test:multiverse:gem_manifest
169169

170170
- name: Save gem manifest
171-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
171+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
172172
with:
173173
name: gem_manifest_${{ matrix.ruby-version }}_${{ matrix.multiverse }}.json
174174
path: gem_manifest_${{ matrix.ruby-version }}_${{ matrix.multiverse }}.json
@@ -259,7 +259,7 @@ jobs:
259259
uses: ./.github/actions/annotate
260260

261261
- name: Save coverage results
262-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
262+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
263263
with:
264264
name: coverage-report-multiverse-${{ matrix.ruby-version }}-services_1
265265
path: lib/coverage_*/.resultset.json
@@ -270,7 +270,7 @@ jobs:
270270
run: rake test:multiverse:gem_manifest
271271

272272
- name: Save gem manifest
273-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
273+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
274274
with:
275275
name: gem_manifest_${{ matrix.ruby-version }}_services_1.json
276276
path: gem_manifest_${{ matrix.ruby-version }}_services_1.json
@@ -372,7 +372,7 @@ jobs:
372372
uses: ./.github/actions/annotate
373373

374374
- name: Save coverage results
375-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
375+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
376376
with:
377377
name: coverage-report-multiverse-${{ matrix.ruby-version }}-services_2
378378
path: lib/coverage_*/.resultset.json
@@ -383,7 +383,7 @@ jobs:
383383
run: rake test:multiverse:gem_manifest
384384

385385
- name: Save gem manifest
386-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
386+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
387387
with:
388388
name: gem_manifest_${{ matrix.ruby-version }}_services_2.json
389389
path: gem_manifest_${{ matrix.ruby-version }}_services_2.json
@@ -464,7 +464,7 @@ jobs:
464464
uses: ./.github/actions/annotate
465465

466466
- name: Save coverage results
467-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
467+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
468468
with:
469469
name: coverage-report-multiverse-${{ matrix.ruby-version }}-services_kafka
470470
path: lib/coverage_*/.resultset.json
@@ -475,7 +475,7 @@ jobs:
475475
run: rake test:multiverse:gem_manifest
476476

477477
- name: Save gem manifest
478-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
478+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
479479
with:
480480
name: gem_manifest_${{ matrix.ruby-version }}_services_kafka.json
481481
path: gem_manifest_${{ matrix.ruby-version }}_services_kafka.json
@@ -534,7 +534,7 @@ jobs:
534534
- if: matrix.ruby-version == '2.4.10'
535535
name: Cache mysql55
536536
id: mysql55-cache
537-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # tag v4.2.2
537+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
538538
with:
539539
path: /usr/local/mysql55
540540
key: mysql55-install
@@ -583,7 +583,7 @@ jobs:
583583
uses: ./.github/actions/annotate
584584

585585
- name: Save coverage results
586-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
586+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
587587
with:
588588
name: coverage-report-multiverse-${{ matrix.ruby-version }}-service_mysql_pg
589589
path: lib/coverage_*/.resultset.json
@@ -594,7 +594,7 @@ jobs:
594594
run: rake test:multiverse:gem_manifest
595595

596596
- name: Save gem manifest
597-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
597+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
598598
with:
599599
name: gem_manifest_${{ matrix.ruby-version }}_service_mysql_pg.json
600600
path: gem_manifest_${{ matrix.ruby-version }}_service_mysql_pg.json
@@ -638,7 +638,7 @@ jobs:
638638
uses: ./.github/actions/annotate
639639

640640
- name: Save coverage results
641-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
641+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
642642
with:
643643
name: coverage-report-infinite-tracing-${{ matrix.ruby-version }}-infinite_tracing
644644
path: lib/coverage_*/.resultset.json
@@ -660,11 +660,11 @@ jobs:
660660
ruby-version: 3.4
661661
- run: bundle
662662
- name: Download all workflow run artifacts
663-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # tag v4.1.9
663+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # tag v4.2.1
664664
- name: Collate Coverage Results
665665
run: bundle exec rake coverage:report
666666
- name: Upload coverage results
667-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
667+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
668668
with:
669669
name: coverage-report-combined-${{ matrix.ruby-version }}
670670
path: lib/coverage_results

‎.github/workflows/ci_cron.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- if: matrix.ruby-version == '2.4.10' || matrix.ruby-version == '2.5.9' || matrix.ruby-version == '2.6.10'
9797
name: Cache mysql55
9898
id: mysql55-cache
99-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # tag v4.2.2
99+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
100100
with:
101101
path: /usr/local/mysql55
102102
key: mysql55-install
@@ -465,7 +465,7 @@ jobs:
465465
- if: matrix.ruby-version == '2.4.10'
466466
name: Cache mysql55
467467
id: mysql55-cache
468-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # tag v4.2.2
468+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
469469
with:
470470
path: /usr/local/mysql55
471471
key: mysql55-install

‎.github/workflows/ci_jruby.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,51 @@ jobs:
7171
- name: Annotate errors
7272
if: ${{ failure() }}
7373
uses: ./.github/actions/annotate
74+
75+
jruby_sidekiq:
76+
runs-on: ubuntu-22.04
77+
services:
78+
redis:
79+
image: redis
80+
ports:
81+
- 6379:6379
82+
options: >-
83+
--health-cmd "redis-cli ping"
84+
--health-interval 10s
85+
--health-timeout 5s
86+
--health-retries 5
87+
strategy:
88+
fail-fast: false
89+
matrix:
90+
suite: [sidekiq]
91+
92+
steps:
93+
- name: Configure git
94+
run: 'git config --global init.defaultBranch main'
95+
96+
- name: Check out the source code
97+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag v4.2.2
98+
99+
- name: Install JRuby
100+
uses: ruby/setup-ruby@bbda85882f33075a3727c01e3c8d0de0be6146ce # tag v1.224.0
101+
with:
102+
ruby-version: jruby-9.4.12.0
103+
104+
- name: Bundle
105+
run: bundle install
106+
107+
- name: Run Multiverse Tests
108+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # tag v3.0.2
109+
with:
110+
timeout_minutes: 20
111+
max_attempts: 3
112+
command: "bundle exec rake test:multiverse[${{ matrix.suite }}]"
113+
env:
114+
VERBOSE_TEST_OUTPUT: true
115+
SERIALIZE: 1
116+
JAVA_OPTS: --add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist -Xmx4g -Xms512m
117+
JRUBY_OPTS: --dev
118+
119+
- name: Annotate errors
120+
if: ${{ failure() }}
121+
uses: ./.github/actions/annotate

‎.github/workflows/performance_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- run: bundle
4343
- run: bundle exec script/runner -C -M > performance_results.md
4444
- name: Save performance results
45-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # tag v4.6.1
45+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
4646
with:
4747
name: performance-test-results-${{ matrix.ruby-version }}
4848
path: ./test/performance/performance_results.md

‎.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ jobs:
2323
- name: Install onetimepass
2424
run: pip install onetimepass==1.0.1
2525

26+
- name: Configure gem credentials
27+
run: |
28+
echo "GEM_HOST_API_KEY=${{ secrets.RUBYGEMS_API_KEY }}" >> $GITHUB_ENV
29+
echo "RUBYGEMS_MFA_KEY=${{ secrets.RUBYGEMS_MFA_KEY }}" >> $GITHUB_ENV
30+
2631
- name: Build newrelic_rpm gem
2732
run: gem build newrelic_rpm.gemspec
2833

@@ -45,17 +50,13 @@ jobs:
4550
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4651

4752
- name: Obtain OTP to publish newrelic_rpm to rubygems.org
48-
env:
49-
RUBYGEMS_MFA_KEY: ${{ secrets.RUBYGEMS_MFA_KEY }}
50-
run: echo "RUBYGEMS_OTP=$(python ./.github/workflows/scripts/rubygems-authenticate.py $RUBYGEMS_MFA_KEY)" >> $GITHUB_ENV
53+
run: echo "RUBYGEMS_OTP=$(python ./.github/workflows/scripts/rubygems-authenticate.py RUBYGEMS_MFA_KEY)" >> $GITHUB_ENV
5154

5255
- name: Publish newrelic_rpm to rubygems.org
5356
run: ruby ./.github/workflows/scripts/rubygems-publish.rb newrelic_rpm
5457

5558
- name: Obtain OTP to publish newrelic-infinite_tracing to rubygems.org
56-
env:
57-
RUBYGEMS_MFA_KEY: ${{ secrets.RUBYGEMS_MFA_KEY }}
58-
run: echo "RUBYGEMS_OTP=$(python ./.github/workflows/scripts/rubygems-authenticate.py $RUBYGEMS_MFA_KEY)" >> $GITHUB_ENV
59+
run: echo "RUBYGEMS_OTP=$(python ./.github/workflows/scripts/rubygems-authenticate.py RUBYGEMS_MFA_KEY)" >> $GITHUB_ENV
5960

6061
- name: Publish newrelic-infinite_tracing to rubygems.org
6162
run: ruby ./.github/workflows/scripts/rubygems-publish.rb infinite_tracing/newrelic-infinite_tracing

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# New Relic Ruby Agent Release Notes
22

3-
## dev
3+
## v9.18.0
44

55
- **Feature: Add elasticsearch.capture_cluster_name configuration option**
66

0 commit comments

Comments
 (0)