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 }}" 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 - - - - - - - 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) { } }