Skip to content

Commit 695be3f

Browse files
hannahramadanhannahramadan
committed
Merge branch 'dev' into ci_ruby_3_5
2 parents 99e0dea + 8db96cd commit 695be3f

File tree

137 files changed

+3545
-219
lines changed

Some content is hidden

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

137 files changed

+3545
-219
lines changed

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: 'Run Perfverse'
2+
description: 'Runs performance testing on the specified agent tag'
3+
inputs:
4+
agent_tag:
5+
description: 'What agent version to install'
6+
required: true
7+
agent_env_vars:
8+
description: ''
9+
required: false
10+
run_time:
11+
description: ''
12+
required: true
13+
nr_license_key:
14+
description: ''
15+
required: true
16+
test_tag:
17+
description: ''
18+
required: true
19+
docker_monitor_output_dir:
20+
description: ''
21+
required: true
22+
default: docker_monitor_output
23+
run_label:
24+
description: ''
25+
required: true
26+
iterations:
27+
description: ''
28+
required: true
29+
default: 3
30+
31+
runs:
32+
using: "composite"
33+
steps:
34+
- name: Install Ruby
35+
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
36+
with:
37+
ruby-version: 3.4
38+
39+
- name: Run ruby script
40+
shell: bash
41+
run: |
42+
ruby ./.github/workflows/scripts/run_perf_tests.rb
43+
env:
44+
AGENT_TAG: ${{ inputs.agent_tag }}
45+
TEST_TAG: ${{ inputs.test_tag }}
46+
RUN_TIME: ${{ inputs.run_time }}
47+
NR_LICENSE_KEY: ${{ inputs.nr_license_key }}
48+
DOCKER_MONITOR_OUTPUT_DIR: ${{ inputs.docker_monitor_output_dir }}
49+
ITERATIONS: ${{ inputs.iterations }}
50+
51+
- name: Upload docker report
52+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
53+
with:
54+
if-no-files-found: error
55+
path: test/perfverse/docker_monitor/${{ inputs.docker_monitor_output_dir}}/
56+
name: docker_monitor_report-${{ inputs.run_label }}
57+
retention-days: 1
58+
59+
60+
61+
62+
63+
64+
65+
66+
67+
68+
69+

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ runs:
4949
"rails": "norails,rails61,rails70,rails71,rails72"
5050
},
5151
"3.2.8": {
52-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
52+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5353
},
5454
"3.3.8": {
55-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
55+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5656
},
5757
"3.4.4": {
58-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
58+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5959
},
6060
"3.5.0-preview1": {
61-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
61+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
6262
}
6363
}
6464

‎.github/pull_request_template.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Describe the changes present in the pull request
55

66
Submitter Checklist:
77
- [ ] Include a link to the related GitHub issue, if applicable
8-
- [ ] Include a security review link, if applicable
8+
- [ ] Add new tests for your change, if applicable
99

1010
# Testing
1111
The agent includes a suite of unit and functional tests which should be used to
@@ -18,7 +18,5 @@ exercise your changes.
1818

1919
# Reviewer Checklist
2020
- [ ] Perform code review
21-
- [ ] Add performance label
22-
- [ ] Perform appropriate level of performance testing
2321
- [ ] Confirm all checks passed
24-
- [ ] Add version label prior to acceptance
22+
- [ ] Open a separate PR to add a CHANGELOG entry

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 20 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
17-
- uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
17+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1818
with:
1919
ruby-version: 3.5.0-preview1
2020
- run: bundle
@@ -199,30 +199,30 @@ jobs:
199199
needs: run_rubocop
200200
runs-on: ubuntu-22.04
201201
services:
202-
kafka:
203-
image: bitnami/kafka:3.9.0
202+
zookeeper:
203+
image: confluentinc/cp-zookeeper:7.9.1
204204
ports:
205-
- 9092:9092
205+
- 2181:2181
206+
env:
207+
ZOOKEEPER_CLIENT_PORT: 2181
208+
ZOOKEEPER_TICK_TIME: 2000
206209
options: >-
207-
--health-cmd "kafka-broker-api-versions.sh --version"
210+
--health-cmd "timeout 10s bash -c '</dev/tcp/localhost/2181'"
208211
--health-interval 10s
209212
--health-timeout 5s
210213
--health-retries 5
211-
env:
212-
KAFKA_CFG_ZOOKEEPER_CONNECT: zookeeper:2181
213-
ALLOW_PLAINTEXT_LISTENER: yes
214-
KAFKA_LISTENERS: INSIDE://0.0.0.0:9093,OUTSIDE://0.0.0.0:9092
215-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
216-
KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
217-
KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
218-
zookeeper:
219-
image: bitnami/zookeeper
214+
215+
kafka:
216+
image: confluentinc/cp-kafka:7.9.1
220217
ports:
221-
- 2181:2181
218+
- 9092:9092
222219
env:
223-
ALLOW_ANONYMOUS_LOGIN: yes
220+
KAFKA_BROKER_ID: 1
221+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
222+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
223+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
224224
options: >-
225-
--health-cmd "echo mntr | nc -w 2 -q 2 localhost 2181"
225+
--health-cmd "timeout 10s bash -c '</dev/tcp/localhost/9092'"
226226
--health-interval 10s
227227
--health-timeout 5s
228228
--health-retries 5
@@ -310,16 +310,16 @@ jobs:
310310
- name: Configure git
311311
run: 'git config --global init.defaultBranch main'
312312
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
313-
- uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
313+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
314314
with:
315315
ruby-version: 3.5.0-preview1
316316
- run: bundle
317317
- name: Download all workflow run artifacts
318-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag v5.0.0
318+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag v6.0.0
319319
- name: Collate Coverage Results
320320
run: bundle exec rake coverage:report
321321
- name: Upload coverage results
322-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
322+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag v5.0.0
323323
with:
324324
name: coverage-report-combined-${{ matrix.ruby-version }}
325325
path: lib/coverage_results

‎.github/workflows/ci_cron.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Configure git
1717
run: 'git config --global init.defaultBranch main'
1818
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
19-
- uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
19+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2020
with:
2121
ruby-version: 3.5.0-preview1
2222
- run: bundle
@@ -201,30 +201,30 @@ jobs:
201201
needs: run_rubocop
202202
runs-on: ubuntu-22.04
203203
services:
204-
kafka:
205-
image: bitnami/kafka:3.9.0
204+
zookeeper:
205+
image: confluentinc/cp-zookeeper:7.9.1
206206
ports:
207-
- 9092:9092
207+
- 2181:2181
208+
env:
209+
ZOOKEEPER_CLIENT_PORT: 2181
210+
ZOOKEEPER_TICK_TIME: 2000
208211
options: >-
209-
--health-cmd "kafka-broker-api-versions.sh --version"
212+
--health-cmd "timeout 10s bash -c '</dev/tcp/localhost/2181'"
210213
--health-interval 10s
211214
--health-timeout 5s
212215
--health-retries 5
213-
env:
214-
KAFKA_CFG_ZOOKEEPER_CONNECT: zookeeper:2181
215-
ALLOW_PLAINTEXT_LISTENER: yes
216-
KAFKA_LISTENERS: INSIDE://0.0.0.0:9093,OUTSIDE://0.0.0.0:9092
217-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
218-
KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
219-
KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
220-
zookeeper:
221-
image: bitnami/zookeeper
216+
217+
kafka:
218+
image: confluentinc/cp-kafka:7.9.1
222219
ports:
223-
- 2181:2181
220+
- 9092:9092
224221
env:
225-
ALLOW_ANONYMOUS_LOGIN: yes
222+
KAFKA_BROKER_ID: 1
223+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
224+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
225+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
226226
options: >-
227-
--health-cmd "echo mntr | nc -w 2 -q 2 localhost 2181"
227+
--health-cmd "timeout 10s bash -c '</dev/tcp/localhost/9092'"
228228
--health-interval 10s
229229
--health-timeout 5s
230230
--health-retries 5

‎.github/workflows/ci_jruby.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
1717

1818
- name: Install JRuby
19-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
19+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2020
with:
2121
ruby-version: jruby-9.4.14.0
2222

@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
5050

5151
- name: Install JRuby
52-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
52+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
5353
with:
5454
ruby-version: jruby-9.4.14.0
5555

@@ -97,7 +97,7 @@ jobs:
9797
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
9898

9999
- name: Install JRuby
100-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
100+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
101101
with:
102102
ruby-version: jruby-9.4.14.0
103103

‎.github/workflows/ci_special.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: URL Test CI
22

33
on:
4-
# schedule:
5-
# - cron: '0 9 * * *'
4+
schedule:
5+
- cron: '0 9 * * *'
66
workflow_dispatch:
77

88
jobs:
@@ -21,7 +21,7 @@ jobs:
2121
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2222

2323
- name: Install Ruby 3.4
24-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
24+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2525
with:
2626
ruby-version: 3.4
2727

‎.github/workflows/config_docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
steps:
1717
- name: Install Ruby 3.4
18-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
18+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1919
with:
2020
ruby-version: 3.4
2121

‎.github/workflows/label_community_cards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Label community issue
18-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # tag v7.0.1
18+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # tag v8.0.0
1919
with:
2020
script: |
2121
github.rest.issues.addLabels({

‎.github/workflows/lambda_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
contents: write
1515
repository-projects: write
1616
steps:
17-
- uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
17+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1818
with:
1919
ruby-version: 3.4
2020

0 commit comments

Comments
 (0)