From 160d3183b7685f41ed8d5e9db117cb91fbe3f1ae Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 24 Jun 2025 11:09:33 +0100 Subject: [PATCH 1/2] Remove dead `@TestIssueLogging` anns from repo-s3 These logging directives relate to test failures that have long-since been closed so can be removed. Relates #101608 Relates #88841 --- modules/repository-s3/build.gradle | 5 ----- .../repositories/s3/S3BlobStoreRepositoryTests.java | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle index 9f77d2489cb81..aef6e96f4a8f0 100644 --- a/modules/repository-s3/build.gradle +++ b/modules/repository-s3/build.gradle @@ -124,11 +124,6 @@ esplugin.bundleSpec.from('config/repository-s3') { into 'config' } -tasks.named("internalClusterTest").configure { - // TODO: remove once https://github.com/elastic/elasticsearch/issues/101608 is fixed - systemProperty 'es.insecure_network_trace_enabled', 'true' -} - tasks.named("thirdPartyAudit").configure { ignoreMissingClasses( // missing/unused classes diff --git a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java index 09b8f8179d3d0..332af93aa3430 100644 --- a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java +++ b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java @@ -181,15 +181,6 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { return builder.build(); } - @Override - @TestIssueLogging( - issueUrl = "https://github.com/elastic/elasticsearch/issues/88841", - value = "com.amazonaws.request:DEBUG,com.amazonaws.http.AmazonHttpClient:TRACE" - ) - public void testRequestStats() throws Exception { - super.testRequestStats(); - } - public void testAbortRequestStats() throws Exception { final String repository = createRepository(randomRepositoryName(), false); @@ -233,10 +224,6 @@ public void testAbortRequestStats() throws Exception { assertEquals(assertionErrorMsg, mockCalls, sdkRequestCounts); } - @TestIssueLogging( - issueUrl = "https://github.com/elastic/elasticsearch/issues/101608", - value = "com.amazonaws.request:DEBUG,com.amazonaws.http.AmazonHttpClient:TRACE" - ) public void testMetrics() throws Exception { // Create the repository and perform some activities final String repository = createRepository(randomRepositoryName(), false); From 373bcf847c106cc1c0cbace141eda3da9cf142c4 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Tue, 24 Jun 2025 10:21:36 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../repositories/s3/S3BlobStoreRepositoryTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java index 332af93aa3430..2c363177f92ec 100644 --- a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java +++ b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java @@ -65,7 +65,6 @@ import org.elasticsearch.test.BackgroundIndexer; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.MockLog; -import org.elasticsearch.test.junit.annotations.TestIssueLogging; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.xcontent.NamedXContentRegistry; import org.elasticsearch.xcontent.XContentFactory;