Revert "PoC for Metrics and Logging UA Configuration."

This reverts commit 1681e19.

Author: phipag

examples/powertools-examples-core-utilities/sam/pom.xml

@@ -45,11 +45,6 @@
             <artifactId>aspectjrt</artifactId>
             <version>${aspectj.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3</artifactId>
-            <version>2.32.8</version>
-        </dependency>
     </dependencies>
 
     <build>

examples/powertools-examples-core-utilities/sam/src/main/java/helloworld/App.java

@@ -34,13 +34,6 @@
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
-import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
-import software.amazon.awssdk.core.SdkSystemSetting;
-import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.http.SdkHttpRequest;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.lambda.powertools.logging.Logging;
 import software.amazon.lambda.powertools.metrics.FlushMetrics;
 import software.amazon.lambda.powertools.metrics.Metrics;
@@ -57,32 +50,13 @@
  */
 public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
     private static final Logger log = LoggerFactory.getLogger(App.class);
-    private static final S3Client s3Client = S3Client.builder()
-            .region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
-            .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
-            .overrideConfiguration(c -> c.addExecutionInterceptor(new ExecutionInterceptor() {
-                @Override
-                public void beforeTransmission(
-                        software.amazon.awssdk.core.interceptor.Context.BeforeTransmission context,
-                        ExecutionAttributes executionAttributes) {
-                    SdkHttpRequest request = context.httpRequest();
-                    log.info("User-Agent header: {}", request.headers().get("User-Agent"));
-                }
-            }))
-            .build();
     private static final Metrics metrics = MetricsFactory.getMetricsInstance();
 
-    public App() {
-        log.info("sdk.ua.appId system property: {}", System.getProperty("sdk.ua.appId"));
-        s3Client.listBuckets();
-    }
-
     @Logging(logEvent = true, samplingRate = 0.7)
     @Tracing(captureMode = CaptureMode.RESPONSE_AND_ERROR)
     @FlushMetrics(namespace = "ServerlessAirline", service = "payment", captureColdStart = true)
     public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
         Map<String, String> headers = new HashMap<>();
-        s3Client.listBuckets();
 
         headers.put("Content-Type", "application/json");
         headers.put("X-Custom-Header", "application/json");

examples/powertools-examples-core-utilities/sam/template.yaml

@@ -19,22 +19,11 @@ Globals:
         POWERTOOLS_METRICS_NAMESPACE: Coreutilities
 
 Resources:
-  TestBucket:
-    Type: AWS::S3::Bucket
-
   HelloWorldFunction:
     Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
     Properties:
       CodeUri: .
       Handler: helloworld.App::handleRequest
-      Policies:
-        - S3ReadPolicy:
-            BucketName: !Ref TestBucket
-        - Statement:
-            - Effect: Allow
-              Action:
-                - s3:ListAllMyBuckets
-              Resource: "*"
       Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
         Variables:
           POWERTOOLS_SERVICE_NAME: hello

powertools-common/src/main/java/software/amazon/lambda/powertools/common/internal/UserAgentConfigurator.java

@@ -19,14 +19,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Can be used to create a string that can server as a User-Agent suffix in requests made with the AWS SDK clients
  */
-public final class UserAgentConfigurator {
+public class UserAgentConfigurator {
 
     public static final String NA = "NA";
     public static final String VERSION_KEY = "powertools.version";
@@ -37,7 +37,7 @@ public final class UserAgentConfigurator {
     private static final Logger LOG = LoggerFactory.getLogger(UserAgentConfigurator.class);
     private static final String NO_OP = "no-op";
     private static final String POWERTOOLS_VERSION = getProjectVersion();
-    private static final String USER_AGENT_PATTERN = "PT/" + PT_FEATURE_VARIABLE + "/" + POWERTOOLS_VERSION + " PTENV/"
+    private static final String USER_AGENT_PATTERN = "PT/" + PT_FEATURE_VARIABLE + "/" + POWERTOOLS_VERSION + " PTEnv/"
             + PT_EXEC_ENV_VARIABLE;
 
     private UserAgentConfigurator() {
@@ -53,6 +53,7 @@ static String getProjectVersion() {
         return getVersionFromProperties(VERSION_PROPERTIES_FILENAME, VERSION_KEY);
     }
 
+
     /**
      * Retrieves the project version from a properties file.
      * The file should be in the resources folder.
@@ -82,18 +83,9 @@ static String getVersionFromProperties(String propertyFileName, String versionKe
         return NA;
     }
 
-    /**
-     * Configures the AWS SDK to use Powertools user agent by setting the sdk.ua.appId system property.
-     * This should be called during library initialization to ensure the user agent is properly configured.
-     */
-    public static void configureUserAgent(String ptFeature) {
-        System.out.println("CONFIGURE UA " + ptFeature);
-        System.setProperty("sdk.ua.appId", getUserAgent(ptFeature));
-    }
-
     /**
      * Retrieves the user agent string for the Powertools for AWS Lambda.
-     * It follows the pattern PT/{PT_FEATURE}/{PT_VERSION} PTENV/{PT_EXEC_ENV}
+     * It follows the pattern PT/{PT_FEATURE}/{PT_VERSION} PTEnv/{PT_EXEC_ENV}
      * The version of the project is automatically retrieved.
      * The PT_EXEC_ENV is automatically retrieved from the AWS_EXECUTION_ENV environment variable.
      * If it AWS_EXECUTION_ENV is not set, PT_EXEC_ENV defaults to "NA"
@@ -113,7 +105,7 @@ public static String getUserAgent(String ptFeature) {
             ptFeature = NO_OP;
         }
         return userAgent
-                .replace(PT_FEATURE_VARIABLE, ptFeature.toUpperCase())
+                .replace(PT_FEATURE_VARIABLE, ptFeature)
                 .replace(PT_EXEC_ENV_VARIABLE, ptExecEnv);
     }
 }

powertools-common/src/test/java/software/amazon/lambda/powertools/common/internal/UserAgentConfiguratorTest.java

@@ -91,7 +91,7 @@ void testGetUserAgent() {
 
         assertThat(userAgent)
                 .isNotNull()
-                .isEqualTo("PT/TEST-FEATURE/" + VERSION + " PTENV/NA");
+                .isEqualTo("PT/test-feature/" + VERSION + " PTEnv/NA");
 
     }
 
@@ -101,7 +101,7 @@ void testGetUserAgent_NoFeature() {
 
         assertThat(userAgent)
                 .isNotNull()
-                .isEqualTo("PT/NO-OP/" + VERSION + " PTENV/NA");
+                .isEqualTo("PT/no-op/" + VERSION + " PTEnv/NA");
     }
 
     @Test
@@ -110,7 +110,7 @@ void testGetUserAgent_NullFeature() {
 
         assertThat(userAgent)
                 .isNotNull()
-                .isEqualTo("PT/NO-OP/" + VERSION + " PTENV/NA");
+                .isEqualTo("PT/no-op/" + VERSION + " PTEnv/NA");
     }
 
     @Test
@@ -120,15 +120,7 @@ void testGetUserAgent_SetAWSExecutionEnv() {
 
         assertThat(userAgent)
                 .isNotNull()
-                .isEqualTo("PT/TEST-FEATURE/" + VERSION + " PTENV/AWS_Lambda_java8");
-    }
-
-    @Test
-    void testConfigureUserAgent() {
-        UserAgentConfigurator.configureUserAgent("test-feature");
-        
-        assertThat(System.getProperty("sdk.ua.appId"))
-                .isEqualTo("PT/TEST-FEATURE/" + VERSION + " PTENV/NA");
+                .isEqualTo("PT/test-feature/" + VERSION + " PTEnv/AWS_Lambda_java8");
     }
 
 }

powertools-logging/powertools-logging-log4j/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -39,11 +39,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-layout-template-json</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sdk-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

powertools-logging/powertools-logging-log4j/src/main/java/software/amazon/lambda/powertools/logging/log4/internal/LoggingUserAgentInterceptor.java

@@ -73,11 +73,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sdk-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>