HADOOP-19654. SDK update: ITestAWSStatisticCollection fails against s3 express

Revert test to original assert (no special treatment of s3 express),
and log Initiating GET request" for ease of log scanning.

Add to the log4.properties file the settings needed to turn on wire logging,
commented out by default.

Author: steveloughran

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/statistics/ITestAWSStatisticCollection.java

@@ -19,25 +19,27 @@
 package org.apache.hadoop.fs.s3a.statistics;
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.fs.s3a.S3ATestUtils;
 import org.apache.hadoop.fs.s3a.performance.AbstractS3ACostTest;
 
-import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_CREATE_PERFORMANCE;
-import static org.apache.hadoop.fs.s3a.Constants.FS_S3A_PERFORMANCE_FLAGS;
 import static org.apache.hadoop.fs.s3a.Constants.S3EXPRESS_CREATE_SESSION;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.setPerformanceFlags;
 import static org.apache.hadoop.fs.s3a.Statistic.STORE_IO_REQUEST;
-import static org.apache.hadoop.fs.s3a.impl.S3ExpressStorage.STORE_CAPABILITY_S3_EXPRESS_STORAGE;
 
 /**
  * Verify that AWS SDK statistics are wired up.
  */
 public class ITestAWSStatisticCollection extends AbstractS3ACostTest {
 
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ITestAWSStatisticCollection.class);
+
   @Override
   public Configuration createConfiguration() {
     final Configuration conf = super.createConfiguration();
@@ -50,14 +52,13 @@ public Configuration createConfiguration() {
 
   @Test
   public void testSDKMetricsCostOfGetFileStatusOnFile() throws Throwable {
-    describe("performing getFileStatus on a file");
+    describe("Performing getFileStatus() on a file");
     Path simpleFile = file(methodPath());
     // and repeat on the file looking at AWS wired up stats
     final S3AFileSystem fs = getFileSystem();
+    LOG.info("Initiating GET request for {}", simpleFile);
     verifyMetrics(() -> fs.getFileStatus(simpleFile),
-        with(STORE_IO_REQUEST,
-            fs.hasPathCapability(new Path("/"), STORE_CAPABILITY_S3_EXPRESS_STORAGE)
-            ? 2 : 1));
+        with(STORE_IO_REQUEST, 1));
   }
 
 }

hadoop-tools/hadoop-aws/src/test/resources/log4j.properties

@@ -68,8 +68,13 @@ log4j.logger.org.apache.hadoop.fs.s3a.SDKV2Upgrade=WARN
 # include sensitive information such as account IDs in HTTP headers.
 # log4j.logger.software.amazon.awssdk.request=DEBUG
 
+# Log TLS info
+#log4j.logger.software.amazon.awssdk.thirdparty.org.apache.http.conn.ssl.SSLConnectionSocketFactory=DEBUG
+
+
 # Turn on low level HTTP protocol debugging
-#log4j.logger.org.apache.http.wire=DEBUG
+#log4j.logger.software.amazon.awssdk.thirdparty.org.apache.http.wire=DEBUG
+#log4j.logger.software.amazon.awssdk.thirdparty.org.apache.http=DEBUG
 
 # async client
 #log4j.logger.io.netty.handler.logging=DEBUG