From ce33330d3a7296ce257085524f69711a1049e6ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:58:41 -0500 Subject: [PATCH 1/4] chore(deps): bump peter-evans/create-pull-request (#2572) Bumps the github-actions group with 1 update: [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request). Updates `peter-evans/create-pull-request` from 6.0.5 to 6.1.0 - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/6d6857d36972b65feb161a90e484f2984215f83e...c5a7806660adbe173f04e3e038b0ccdcd758773c) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_profiler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_profiler.yml b/.github/workflows/build_profiler.yml index 139ad9c2d..093dc113a 100644 --- a/.github/workflows/build_profiler.yml +++ b/.github/workflows/build_profiler.yml @@ -370,7 +370,7 @@ jobs: rm -f ${{ github.workspace }}/src/Agent/NewRelic/Home/_temp - name: Create Pull Request - uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5 + uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 with: commit-message: "chore: Update Profiler NuGet Package Reference to v${{ needs.package-and-deploy.outputs.package_version }}." title: "chore: Update Profiler NuGet Package Reference to v${{ needs.package-and-deploy.outputs.package_version }}" From d96e29fff0f040d148f26f2e5ed81edd7192e17f Mon Sep 17 00:00:00 2001 From: Chris Ventura <45495992+nrcventura@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:29:44 -0700 Subject: [PATCH 2/4] notice: The .NET Agent now supports instrumenting AWS Lambda functions. See documentation for details: [https://docs.newrelic.com/docs/serverless-function-monitoring/aws-lambda-monitoring/get-started/monitoring-aws-lambda-serverless-monitoring/](https://docs.newrelic.com/docs/serverless-function-monitoring/aws-lambda-monitoring/get-started/monitoring-aws-lambda-serverless-monitoring/). From 3b61279d0641de47c424c2ad413dd06cce2f31b5 Mon Sep 17 00:00:00 2001 From: Alex Hemsath <57361211+nr-ahemsath@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:01:22 -0700 Subject: [PATCH 3/4] Remove wonky logic in favor of a parameter to the test class constructor (#2574) --- .../Elasticsearch/ElasticsearchTests.cs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs index 73c88b856..0bde7d802 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Elasticsearch/ElasticsearchTests.cs @@ -37,22 +37,12 @@ protected enum ClientType const string SyncMethodSkipReason = "Synchronous methods are deprecated in latest Elastic.Clients.Elasticsearch"; - protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, ClientType clientType) : base(fixture) + protected ElasticsearchTestsBase(TFixture fixture, ITestOutputHelper output, ClientType clientType, bool syncMethodsOk = true) : base(fixture) { _fixture = fixture; _fixture.TestLogger = output; _clientType = clientType; - - // non-async methods are deprecated in the latest Elastic.Clients.Elasticsearch versions - if (_clientType != ClientType.ElasticClients || - (_fixture.GetType() != typeof(ConsoleDynamicMethodFixtureCoreLatest) && _fixture.GetType() != typeof(ConsoleDynamicMethodFixtureFWLatest))) - { - _syncMethodsOk = true; - } - else - { - _syncMethodsOk = false; - } + _syncMethodsOk = syncMethodsOk; _host = GetHostFromElasticServer(_clientType); @@ -340,7 +330,7 @@ public ElasticsearchNetTestsCoreOldest(ConsoleDynamicMethodFixtureCoreOldest fix public class ElasticsearchElasticClientTestsFWLatest : ElasticsearchTestsBase { public ElasticsearchElasticClientTestsFWLatest(ConsoleDynamicMethodFixtureFWLatest fixture, ITestOutputHelper output) - : base(fixture, output, ClientType.ElasticClients) + : base(fixture, output, ClientType.ElasticClients, syncMethodsOk : false) { } } @@ -358,7 +348,7 @@ public ElasticsearchElasticClientTestsFW462(ConsoleDynamicMethodFixtureFW462 fix public class ElasticsearchElasticClientTestsCoreLatest : ElasticsearchTestsBase { public ElasticsearchElasticClientTestsCoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output) - : base(fixture, output, ClientType.ElasticClients) + : base(fixture, output, ClientType.ElasticClients, syncMethodsOk: false) { } } From 47f9d31682128a8a7eb4bb354c702465c9acc3fc Mon Sep 17 00:00:00 2001 From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:53:04 -0500 Subject: [PATCH 4/4] Fix merge error from main branch --- src/Agent/MsiInstaller/Installer/Product.wxs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Agent/MsiInstaller/Installer/Product.wxs b/src/Agent/MsiInstaller/Installer/Product.wxs index af091d8fd..4eae44f16 100644 --- a/src/Agent/MsiInstaller/Installer/Product.wxs +++ b/src/Agent/MsiInstaller/Installer/Product.wxs @@ -397,13 +397,6 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - - @@ -476,13 +469,6 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - -