Changed the GroupID

README.md

@@ -28,8 +28,8 @@ To use a metric logger, you need to manually create and flush the logger.
 
 
 ```java
-import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
+import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
+import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
 
 class Example {
 	public static void main(String[] args) {
@@ -164,8 +164,8 @@ Example:
 
 ```java
 # in process
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 Configuration config = EnvironmentConfigurationProvider.getConfig();
 config.setServiceName("MyApp")
@@ -185,8 +185,8 @@ Example:
 
 ```java
 # in process
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 Configuration config = EnvironmentConfigurationProvider.getConfig();
 config.setServiceType("JavaWebApp")
@@ -206,8 +206,8 @@ Example:
 
 ```java
 # in process
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 Configuration config = EnvironmentConfigurationProvider.getConfig();
 config.setLogGroupName("LogGroupName")
@@ -227,8 +227,8 @@ Example:
 
 ```java
 # in process
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 Configuration config = EnvironmentConfigurationProvider.getConfig();
 config.setLogStreamName(LogStreamName))
@@ -259,8 +259,8 @@ Example:
 
 ```java
 // in process
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 Configuration config = EnvironmentConfigurationProvider.getConfig();
 config.setAgentEndpoint("udp://127.0.0.1:1000");

build.gradle

@@ -20,7 +20,7 @@ plugins {
 	id 'signing'
 }
 
-group "software.amazon.awssdk"
+group "software.amazon.cloudwatchlogs"
 
 allprojects {
 	compileJava {

canarytests/agent/src/main/java/emf/canary/ECSRunnable.java

@@ -1,10 +1,10 @@
 package emf.canary;
 
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
+import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
+import software.amazon.cloudwatchlogs.emf.model.Unit;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;

examples/lambda/src/main/java/Handler.java

@@ -1,8 +1,8 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
+import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
+import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
+import software.amazon.cloudwatchlogs.emf.model.Unit;
 
 import java.util.HashMap;
 import java.util.Map;

src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/EMFIntegrationTestHelper.java → src/integration-test/java/software/amazon/cloudwatchlogs/emf/EMFIntegrationTestHelper.java

@@ -1,4 +1,20 @@
-package software.amazon.awssdk.services.cloudwatchlogs.emf;
+/*
+ *   Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package software.amazon.cloudwatchlogs.emf;
 
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.Datapoint;

src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java → src/integration-test/java/software/amazon/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java

@@ -1,4 +1,20 @@
-package software.amazon.awssdk.services.cloudwatchlogs.emf;
+/*
+ *   Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package software.amazon.cloudwatchlogs.emf;
 
 import static org.junit.Assert.assertTrue;
 
@@ -13,12 +29,12 @@
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;
 import software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsRequest;
 import software.amazon.awssdk.services.cloudwatch.model.Statistic;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.EnvironmentProvider;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
+import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
+import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
+import software.amazon.cloudwatchlogs.emf.model.Unit;
 
 public class MetricsLoggerIntegrationTest {
 

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/Constants.java → src/main/java/software/amazon/cloudwatchlogs/emf/Constants.java

@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf;
+package software.amazon.cloudwatchlogs.emf;
 
 public class Constants {
     public static final int DEFAULT_AGENT_PORT = 25888;

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/Configuration.java → src/main/java/software/amazon/cloudwatchlogs/emf/config/Configuration.java

@@ -14,14 +14,14 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
+package software.amazon.cloudwatchlogs.emf.config;
 
 import java.util.Optional;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils;
+import software.amazon.cloudwatchlogs.emf.environment.Environments;
+import software.amazon.cloudwatchlogs.emf.util.StringUtils;
 
 /** Configuration for EMF logger. */
 @AllArgsConstructor

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationKeys.java → src/main/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationKeys.java

@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
+package software.amazon.cloudwatchlogs.emf.config;
 
 /** The key of configurations used by EMF logger. */
 public class ConfigurationKeys {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java → src/main/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java

@@ -14,10 +14,10 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
+package software.amazon.cloudwatchlogs.emf.config;
 
-import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils;
+import software.amazon.cloudwatchlogs.emf.environment.Environments;
+import software.amazon.cloudwatchlogs.emf.util.StringUtils;
 
 /** Loads configuration from environment variables. */
 public class EnvironmentConfigurationProvider {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/SystemWrapper.java → src/main/java/software/amazon/cloudwatchlogs/emf/config/SystemWrapper.java

@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
+package software.amazon.cloudwatchlogs.emf.config;
 
 /** A wrapper class that can be used to mock 'System.getenv' with PowerMock. */
 public class SystemWrapper {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/AgentBasedEnvironment.java

@@ -14,15 +14,15 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import lombok.extern.slf4j.Slf4j;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.AgentSink;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.Endpoint;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.SocketClientFactory;
+import software.amazon.cloudwatchlogs.emf.Constants;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.sinks.AgentSink;
+import software.amazon.cloudwatchlogs.emf.sinks.Endpoint;
+import software.amazon.cloudwatchlogs.emf.sinks.ISink;
+import software.amazon.cloudwatchlogs.emf.sinks.SocketClientFactory;
 
 @Slf4j
 public abstract class AgentBasedEnvironment implements Environment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/DefaultEnvironment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/DefaultEnvironment.java

@@ -14,12 +14,12 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import lombok.extern.slf4j.Slf4j;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.Constants;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
 
 @Slf4j
 class DefaultEnvironment extends AgentBasedEnvironment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EC2Environment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/EC2Environment.java

@@ -14,16 +14,16 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.net.URI;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.exception.EMFClientException;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.Constants;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.exception.EMFClientException;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
 
 @Slf4j
 class EC2Environment extends AgentBasedEnvironment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/ECSEnvironment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/ECSEnvironment.java

@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -25,11 +25,11 @@
 import java.util.Map;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils;
+import software.amazon.cloudwatchlogs.emf.Constants;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.SystemWrapper;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.util.StringUtils;
 
 @Slf4j
 class ECSEnvironment extends AgentBasedEnvironment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environment.java

@@ -14,10 +14,10 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.sinks.ISink;
 
 /** A runtime environment (e.g. Lambda, EKS, ECS, EC2). */
 public interface Environment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/EnvironmentProvider.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/EnvironmentProvider.java

@@ -14,14 +14,14 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
 
 /** A provider that will detect the environment. */
 public class EnvironmentProvider {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/Environments.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/Environments.java

@@ -14,7 +14,7 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 public enum Environments {
     Local,

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LambdaEnvironment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/LambdaEnvironment.java

@@ -14,13 +14,13 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import java.util.Optional;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.SystemWrapper;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink;
+import software.amazon.cloudwatchlogs.emf.config.SystemWrapper;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink;
+import software.amazon.cloudwatchlogs.emf.sinks.ISink;
 
 /** An environment stands for the AWS Lambda environment. */
 class LambdaEnvironment implements Environment {

src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/environment/LocalEnvironment.java → src/main/java/software/amazon/cloudwatchlogs/emf/environment/LocalEnvironment.java

@@ -14,14 +14,14 @@
  *   limitations under the License.
  */
 
-package software.amazon.awssdk.services.cloudwatchlogs.emf.environment;
+package software.amazon.cloudwatchlogs.emf.environment;
 
 import lombok.extern.slf4j.Slf4j;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.Constants;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.model.MetricsContext;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ConsoleSink;
-import software.amazon.awssdk.services.cloudwatchlogs.emf.sinks.ISink;
+import software.amazon.cloudwatchlogs.emf.Constants;
+import software.amazon.cloudwatchlogs.emf.config.Configuration;
+import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
+import software.amazon.cloudwatchlogs.emf.sinks.ConsoleSink;
+import software.amazon.cloudwatchlogs.emf.sinks.ISink;
 
 @Slf4j
 class LocalEnvironment implements Environment {