feat(logging): Add Cloudwatch Logging Plugin (#2518)

Author: sdhuka

aws-api/src/main/java/com/amplifyframework/api/aws/AppSyncGraphQLOperation.java

@@ -28,6 +28,7 @@
 import com.amplifyframework.api.graphql.GraphQLResponse;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.logging.Logger;
 
 import java.io.IOException;
@@ -50,7 +51,7 @@
  * @param <R> Casted type of GraphQL result data
  */
 public final class AppSyncGraphQLOperation<R> extends GraphQLOperation<R> {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
     private static final String CONTENT_TYPE = "application/json";
     private static final int START_OF_CLIENT_ERROR_CODE = 400;
     private static final int END_OF_CLIENT_ERROR_CODE = 499;

aws-api/src/main/java/com/amplifyframework/api/aws/MultiAuthAppSyncGraphQLOperation.java

@@ -28,6 +28,7 @@
 import com.amplifyframework.api.graphql.GraphQLResponse;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.core.model.auth.AuthorizationTypeIterator;
 import com.amplifyframework.datastore.appsync.AppSyncExtensions;
 import com.amplifyframework.logging.Logger;
@@ -53,7 +54,7 @@
  * @param <R> Casted type of GraphQL result data
  */
 public final class MultiAuthAppSyncGraphQLOperation<R> extends GraphQLOperation<R> {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
     private static final String CONTENT_TYPE = "application/json";
 
     private final String endpoint;

aws-api/src/main/java/com/amplifyframework/api/aws/MutiAuthSubscriptionOperation.java

@@ -27,6 +27,7 @@
 import com.amplifyframework.core.Action;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.core.model.auth.AuthorizationTypeIterator;
 import com.amplifyframework.datastore.appsync.AppSyncExtensions;
 import com.amplifyframework.logging.Logger;
@@ -38,7 +39,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 final class MutiAuthSubscriptionOperation<T> extends GraphQLOperation<T> {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
 
     private final SubscriptionEndpoint subscriptionEndpoint;
     private final ExecutorService executorService;

aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionEndpoint.java

@@ -29,6 +29,7 @@
 import com.amplifyframework.core.Action;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.logging.Logger;
 import com.amplifyframework.util.UserAgent;
 
@@ -60,7 +61,7 @@
  * and multiple GraphQL subscriptions that work on top of it.
  */
 final class SubscriptionEndpoint {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
     private static final int CONNECTION_ACKNOWLEDGEMENT_TIMEOUT = 30 /* seconds */;
     private static final int NORMAL_CLOSURE_STATUS = 1000;
     private static final String UNAUTHORIZED_EXCEPTION = "UnauthorizedException";

aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionOperation.java

@@ -24,6 +24,7 @@
 import com.amplifyframework.core.Action;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.logging.Logger;
 
 import java.util.Objects;
@@ -32,7 +33,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 final class SubscriptionOperation<T> extends GraphQLOperation<T> {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
 
     private final SubscriptionEndpoint subscriptionEndpoint;
     private final ExecutorService executorService;

aws-api/src/main/java/com/amplifyframework/api/aws/auth/ApiRequestDecoratorFactory.java

@@ -32,6 +32,7 @@
 import com.amplifyframework.api.graphql.GraphQLRequest;
 import com.amplifyframework.auth.CognitoCredentialsProvider;
 import com.amplifyframework.core.Amplify;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.logging.Logger;
 
 import java.util.Objects;
@@ -43,7 +44,7 @@
  * Factory class that creates instances of different implementations of {@link RequestDecorator}s.
  */
 public final class ApiRequestDecoratorFactory {
-    private static final Logger LOG = Amplify.Logging.forNamespace("amplify:aws-api");
+    private static final Logger LOG = Amplify.Logging.logger(CategoryType.API, "amplify:aws-api");
     private static final String AUTH_DEPENDENCY_PLUGIN_KEY = "awsCognitoAuthPlugin";
     private static final String APP_SYNC_SERVICE_NAME = "appsync";
     private static final String API_GATEWAY_SERVICE_NAME = "execute-api";

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.kt

@@ -57,6 +57,7 @@ import com.amplifyframework.auth.result.AuthUpdateAttributeResult
 import com.amplifyframework.core.Action
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.Consumer
+import com.amplifyframework.core.category.CategoryType
 import com.amplifyframework.statemachine.codegen.data.AuthConfiguration
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
@@ -77,7 +78,7 @@ class AWSCognitoAuthPlugin : AuthPlugin<AWSCognitoAuthService>() {
     }
 
     private val logger =
-        Amplify.Logging.forNamespace(AWS_COGNITO_AUTH_LOG_NAMESPACE.format(this::class.java.simpleName))
+        Amplify.Logging.logger(CategoryType.AUTH, AWS_COGNITO_AUTH_LOG_NAMESPACE.format(this::class.java.simpleName))
 
     @VisibleForTesting
     internal lateinit var realPlugin: RealAWSCognitoAuthPlugin

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/MultiAuthSyncEngineInstrumentationTest.java

@@ -113,7 +113,10 @@
  * verify behavior when in multi-auth mode.
  */
 public final class MultiAuthSyncEngineInstrumentationTest {
-    private static final Logger LOG = Amplify.Logging.forNamespace("MultiAuthSyncEngineInstrumentationTest");
+    private static final Logger LOG = Amplify.Logging.logger(
+        CategoryType.DATASTORE,
+        "MultiAuthSyncEngineInstrumentationTest"
+    );
     private static final int TIMEOUT_SECONDS = 20;
     private static final String AUDIENCE = "integtest";
     private static final String GOOGLE_ISS_CLAIM = "https://accounts.google.com";

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/MultiAuthSyncEngineNoAuthInstrumentationTest.java

@@ -79,7 +79,10 @@
  * verify behavior when in multi-auth mode.
  */
 public final class MultiAuthSyncEngineNoAuthInstrumentationTest {
-    private static final Logger LOG = Amplify.Logging.forNamespace("MultiAuthSyncEngineInstrumentationTest");
+    private static final Logger LOG = Amplify.Logging.logger(
+        CategoryType.DATASTORE,
+        "MultiAuthSyncEngineInstrumentationTest"
+    );
     private static final int TIMEOUT_SECONDS = 20;
     private static final String GOOGLE_ISS_CLAIM = "https://accounts.google.com";
 

aws-datastore/src/androidTest/java/com/amplifyframework/datastore/storage/sqlite/ModelUpgradeSQLiteInstrumentedTest.java

@@ -21,6 +21,7 @@
 import com.amplifyframework.AmplifyException;
 import com.amplifyframework.core.Amplify;
 import com.amplifyframework.core.Consumer;
+import com.amplifyframework.core.category.CategoryType;
 import com.amplifyframework.core.model.ModelSchema;
 import com.amplifyframework.core.model.SchemaRegistry;
 import com.amplifyframework.datastore.DataStoreConfiguration;
@@ -114,7 +115,7 @@ public void modelVersionStoredCorrectlyBeforeAndAfterUpgrade() throws AmplifyExc
                                     .syncInterval(2L, TimeUnit.MINUTES)
                                     .build());
                 } catch (DataStoreException exception) {
-                    Amplify.Logging.forNamespace("amplify:aws-datastore").warn(exception.toString());
+                    Amplify.Logging.logger(CategoryType.DATASTORE, "amplify:aws-datastore").warn(exception.toString());
                 }
             }
         );
@@ -152,7 +153,7 @@ public void modelVersionStoredCorrectlyBeforeAndAfterUpgrade() throws AmplifyExc
                             .syncInterval(2L, TimeUnit.MINUTES)
                             .build());
                 } catch (DataStoreException exception) {
-                    Amplify.Logging.forNamespace("amplify:aws-datastore").warn(exception.toString());
+                    Amplify.Logging.logger(CategoryType.DATASTORE, "amplify:aws-datastore").warn(exception.toString());
                 }
             }
         );