Skip to content

Commit cde6d84

Browse files
jaffinitojaffinito
committed
Merge branch 'main' of github.com:newrelic/newrelic-dotnet-agent into feature/hangfire-support
2 parents fc3555a + a3623c4 commit cde6d84

50 files changed

Lines changed: 785 additions & 208 deletions

File tree

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ updates:
2727
# Update all NuGet packages used by core agent projects
2828
- package-ecosystem: nuget
2929
directories: # not recursive - only the specified directory will be scanned for .csproj or .sln files
30-
- /build # BuildTools.sln
3130
- /src/Agent/NewRelic/Agent/Core # Core.csproj
3231
- /src/Agent/NewRelic.Api.Agent # NewRelic.Api.Agent.csproj
3332
- /src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions # NewRelic.Agent.Extensions.csproj
@@ -48,6 +47,18 @@ updates:
4847
- dependency-name: "System.Diagnostics.DiagnosticSource"
4948
update-types: ["version-update:semver-major"] # not ready to upgrade to v9 yet
5049

50+
# Update all NuGet packages used by build/release tool projects
51+
- package-ecosystem: nuget
52+
directories: # not recursive - only the specified directory will be scanned for .csproj or .sln files
53+
- /build # BuildTools.sln
54+
schedule:
55+
interval: monthly
56+
commit-message:
57+
prefix: "chore(deps):"
58+
groups:
59+
nuget-agent:
60+
patterns:
61+
- "*"
5162

5263
# Update a specific set of packages for unit and integration tests
5364
- package-ecosystem: nuget

‎.github/workflows/all_solutions.yml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Harden Runner
58-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
58+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
5959
with:
6060
disable-sudo: true
6161
egress-policy: audit
@@ -92,7 +92,7 @@ jobs:
9292
filter: blob:none
9393

9494
- name: Cache NuGet packages
95-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
95+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
9696
with:
9797
path: ~/.nuget/packages
9898
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -118,7 +118,7 @@ jobs:
118118
shell: powershell
119119

120120
- name: Archive FullAgent Home folders
121-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
121+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
122122
with:
123123
name: homefolders
124124
path: |
@@ -162,7 +162,7 @@ jobs:
162162
shell: powershell
163163

164164
- name: Archive msi _build Artifacts
165-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
165+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
166166
with:
167167
name: msi-build-folder-artifacts
168168
path: ${{ github.workspace }}\src\_build
@@ -197,7 +197,7 @@ jobs:
197197
unbounded-namespaces: ${{ steps.compute.outputs.unbounded }}
198198
steps:
199199
- name: Harden Runner
200-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
200+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
201201
with:
202202
disable-sudo: true
203203
egress-policy: audit
@@ -242,6 +242,7 @@ jobs:
242242
"DataTransmission",
243243
"DistributedTracing",
244244
"Errors",
245+
"Grpc",
245246
"Hangfire",
246247
"HttpClientInstrumentation",
247248
"HybridHttpContextStorage",
@@ -250,10 +251,12 @@ jobs:
250251
"Logging.AuditLog",
251252
"Logging.ContextData",
252253
"Logging.HsmAndCsp",
254+
"Logging.Labels",
253255
"Logging.LocalDecoration",
254256
"Logging.LogLevelDetection",
255257
"Logging.MaxSamplesStored",
256258
"Logging.MetricsAndForwarding",
259+
"Logging.StructuredLogArgContextData",
257260
"Logging.ZeroMaxSamplesStored",
258261
"MassTransit",
259262
"OpenTelemetry",
@@ -286,6 +289,7 @@ jobs:
286289
"MySql",
287290
"NServiceBus",
288291
"NServiceBus5",
292+
"OpenSearch",
289293
"Oracle",
290294
"Postgres",
291295
"RabbitMq",
@@ -334,7 +338,7 @@ jobs:
334338
filter: blob:none
335339

336340
- name: Cache NuGet packages
337-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
341+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
338342
with:
339343
path: ~/.nuget/packages
340344
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -423,7 +427,7 @@ jobs:
423427
shell: powershell
424428

425429
- name: Archive Artifacts
426-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
430+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
427431
with:
428432
name: integrationtests
429433
path: |
@@ -449,7 +453,7 @@ jobs:
449453
filter: blob:none
450454

451455
- name: Cache NuGet packages
452-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
456+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
453457
with:
454458
path: ~/.nuget/packages
455459
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -527,7 +531,7 @@ jobs:
527531
shell: powershell
528532

529533
- name: Archive Artifacts
530-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
534+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
531535
with:
532536
name: unboundedintegrationtests
533537
path: |
@@ -716,15 +720,15 @@ jobs:
716720

717721
- name: Upload payload bytes log
718722
if: inputs.aggregate_payload_data == true || github.event_name == 'schedule'
719-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
723+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
720724
with:
721725
name: integration-payload-bytes-${{ matrix.namespace }}
722726
path: C:\IntegrationTestWorkingDirectory\TestResults\*_payload_bytes.json
723727
if-no-files-found: warn
724728

725729
- name: Archive integration test results on failure
726730
if: ${{ failure() }}
727-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
731+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
728732
with:
729733
name: integration-test-results-${{ matrix.namespace }}
730734
path: |
@@ -903,15 +907,15 @@ jobs:
903907

904908
- name: Upload payload bytes log
905909
if: inputs.aggregate_payload_data == true || github.event_name == 'schedule'
906-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
910+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
907911
with:
908912
name: unbounded-payload-bytes-${{ matrix.namespace }}
909913
path: C:\IntegrationTestWorkingDirectory\TestResults\*_payload_bytes.json
910914
if-no-files-found: warn
911915

912916
- name: Archive unbounded test results on failure
913917
if: ${{ failure() }}
914-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
918+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
915919
with:
916920
name: unbounded-test-working-directory-${{ matrix.namespace }}
917921
path: |
@@ -927,7 +931,7 @@ jobs:
927931

928932
steps:
929933
- name: Harden Runner
930-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
934+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
931935
with:
932936
disable-sudo: true
933937
egress-policy: audit
@@ -979,7 +983,7 @@ jobs:
979983
shell: bash
980984

981985
- name: Archive RPM Package Artifacts
982-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
986+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
983987
with:
984988
name: rpm-build-artifacts
985989
path: ${{ github.workspace }}/src/_build/CoreArtifacts
@@ -992,7 +996,7 @@ jobs:
992996

993997
steps:
994998
- name: Harden Runner
995-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
999+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
9961000
with:
9971001
disable-sudo: true
9981002
egress-policy: audit
@@ -1030,7 +1034,7 @@ jobs:
10301034
shell: bash
10311035

10321036
- name: Archive Debian Package Artifacts
1033-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1037+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
10341038
with:
10351039
name: debian-build-artifacts
10361040
path: ${{ github.workspace }}/src/_build/CoreArtifacts
@@ -1092,7 +1096,7 @@ jobs:
10921096
shell: powershell
10931097

10941098
- name: Archive Deploy Artifacts
1095-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1099+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
10961100
with:
10971101
name: deploy-artifacts
10981102
path: |
@@ -1108,7 +1112,7 @@ jobs:
11081112
if: always()
11091113
steps:
11101114
- name: Harden Runner
1111-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
1115+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
11121116
with:
11131117
disable-sudo: true
11141118
egress-policy: audit
@@ -1129,7 +1133,7 @@ jobs:
11291133
contents: read
11301134
steps:
11311135
- name: Harden Runner
1132-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
1136+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
11331137
with:
11341138
disable-sudo: true
11351139
egress-policy: audit
@@ -1201,7 +1205,7 @@ jobs:
12011205
shell: bash
12021206

12031207
- name: Upload combined integration payload log
1204-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1208+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
12051209
with:
12061210
name: combined-integration-payload-bytes
12071211
path: combined-logs/integration_payload_bytes_*.json
@@ -1233,7 +1237,7 @@ jobs:
12331237
contents: read
12341238
steps:
12351239
- name: Harden Runner
1236-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
1240+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
12371241
with:
12381242
disable-sudo: true
12391243
egress-policy: audit
@@ -1305,7 +1309,7 @@ jobs:
13051309
shell: bash
13061310

13071311
- name: Upload combined unbounded payload log
1308-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1312+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
13091313
with:
13101314
name: combined-unbounded-payload-bytes
13111315
path: combined-logs/unbounded_payload_bytes_*.json
@@ -1337,7 +1341,7 @@ jobs:
13371341
contents: read
13381342
steps:
13391343
- name: Harden Runner
1340-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
1344+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
13411345
with:
13421346
disable-sudo: true
13431347
egress-policy: audit
@@ -1466,7 +1470,7 @@ jobs:
14661470
shell: bash
14671471

14681472
- name: Upload final consolidated summary
1469-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
1473+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
14701474
with:
14711475
name: final-payload-summary
14721476
path: final_payload_summary.json

‎.github/workflows/build_download_site_index_files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
image: ghcr.io/newrelic/s3indexer
5656
steps:
5757
- name: Login to AWS
58-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
58+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
5959
with:
6060
aws-region: ${{ inputs.aws-region }}
6161
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

‎.github/workflows/build_profiler.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
filter: blob:none
6363

6464
- name: Cache NuGet packages
65-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
65+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
6666
with:
6767
path: ~/.nuget/packages
6868
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
@@ -120,14 +120,14 @@ jobs:
120120
token: ${{ secrets.CODECOV_TOKEN }}
121121

122122
- name: Archive Build Artifacts
123-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
123+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
124124
with:
125125
name: profiler-windows
126126
path: ${{ github.workspace }}\src\Agent\_profilerBuild\**\*
127127
if-no-files-found: error
128128

129129
- name: Archive Code Coverage Artifacts
130-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
130+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
131131
with:
132132
name: profiler-code-coverage
133133
path: |
@@ -181,7 +181,7 @@ jobs:
181181
shell: bash
182182

183183
- name: Archive Artifacts
184-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
184+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
185185
with:
186186
name: profiler-amd64
187187
path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -202,7 +202,7 @@ jobs:
202202

203203
steps:
204204
- name: Harden Runner
205-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
205+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
206206
with:
207207
egress-policy: audit
208208

@@ -254,7 +254,7 @@ jobs:
254254
shell: bash
255255

256256
- name: Archive Artifacts
257-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
257+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
258258
with:
259259
name: profiler-arm64
260260
path: ${{ github.workspace }}/src/Agent/_profilerBuild/
@@ -354,7 +354,7 @@ jobs:
354354

355355
steps:
356356
- name: Harden Runner
357-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
357+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
358358
with:
359359
egress-policy: audit
360360

@@ -375,7 +375,7 @@ jobs:
375375
rm -f ${{ github.workspace }}/src/Agent/NewRelic/Home/_temp
376376
377377
- name: Create Pull Request
378-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
378+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
379379
with:
380380
token: ${{ secrets.DOTNET_AGENT_GH_TOKEN}}
381381
commit-message: "chore: Update Profiler NuGet Package Reference to v${{ needs.package-and-deploy.outputs.package_version }} (built from ${{ github.sha }}).\n\nBuilt from commit: ${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"

‎.github/workflows/check_modified_files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
source-files-changed: ${{ steps.filter.outputs.source-files-changed }}
2323
steps:
2424
- name: Harden Runner
25-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
25+
uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
2626
with:
2727
disable-sudo: true
2828
egress-policy: audit

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
filter: blob:none
5151

5252
- name: Cache NuGet packages
53-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
53+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
5454
with:
5555
path: ~/.nuget/packages
5656
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}

0 commit comments

Comments
 (0)