Skip to content

Commit 3fc4c5c

Browse files
yaozhaoyyaozhaoy
authored
Changed the GroupdID (#25)
1 parent b4d4395 commit 3fc4c5c

File tree

71 files changed

+587
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+587
-217
lines changed

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ To use a metric logger, you need to manually create and flush the logger.
2828

2929

3030
```java
31-
import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
32-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
31+
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
32+
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
3333

3434
class Example {
3535
public static void main(String[] args) {
@@ -164,8 +164,8 @@ Example:
164164

165165
```java
166166
# in process
167-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
168-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
167+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
168+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
169169

170170
Configuration config = EnvironmentConfigurationProvider.getConfig();
171171
config.setServiceName("MyApp")
@@ -185,8 +185,8 @@ Example:
185185

186186
```java
187187
# in process
188-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
189-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
188+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
189+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
190190

191191
Configuration config = EnvironmentConfigurationProvider.getConfig();
192192
config.setServiceType("JavaWebApp")
@@ -206,8 +206,8 @@ Example:
206206

207207
```java
208208
# in process
209-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
210-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
209+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
210+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
211211

212212
Configuration config = EnvironmentConfigurationProvider.getConfig();
213213
config.setLogGroupName("LogGroupName")
@@ -227,8 +227,8 @@ Example:
227227

228228
```java
229229
# in process
230-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
231-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
230+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
231+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
232232

233233
Configuration config = EnvironmentConfigurationProvider.getConfig();
234234
config.setLogStreamName(LogStreamName))
@@ -259,8 +259,8 @@ Example:
259259

260260
```java
261261
// in process
262-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
263-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
262+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
263+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
264264

265265
Configuration config = EnvironmentConfigurationProvider.getConfig();
266266
config.setAgentEndpoint("udp://127.0.0.1:1000");

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
id 'signing'
2121
}
2222

23-
group "software.amazon.awssdk"
23+
group "software.amazon.cloudwatchlogs"
2424

2525
allprojects {
2626
compileJava {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package emf.canary;
22

3-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
4-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
5-
import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
6-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
7-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
3+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
4+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
5+
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
6+
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
7+
import software.amazon.cloudwatchlogs.emf.model.Unit;
88

99
import java.lang.management.ManagementFactory;
1010
import java.lang.management.MemoryMXBean;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import com.amazonaws.services.lambda.runtime.Context;
22
import com.amazonaws.services.lambda.runtime.RequestHandler;
3-
import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
4-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
5-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
3+
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
4+
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
5+
import software.amazon.cloudwatchlogs.emf.model.Unit;
66

77
import java.util.HashMap;
88
import java.util.Map;

‎src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/EMFIntegrationTestHelper.java‎ renamed to ‎src/integration-test/java/software/amazon/cloudwatchlogs/emf/EMFIntegrationTestHelper.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
package software.amazon.awssdk.services.cloudwatchlogs.emf;
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package software.amazon.cloudwatchlogs.emf;
218

319
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
420
import software.amazon.awssdk.services.cloudwatch.model.Datapoint;

‎src/integration-test/java/software/amazon/awssdk/services/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java‎ renamed to ‎src/integration-test/java/software/amazon/cloudwatchlogs/emf/MetricsLoggerIntegrationTest.java‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
package software.amazon.awssdk.services.cloudwatchlogs.emf;
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package software.amazon.cloudwatchlogs.emf;
218

319
import static org.junit.Assert.assertTrue;
420

@@ -13,12 +29,12 @@
1329
import software.amazon.awssdk.services.cloudwatch.model.Dimension;
1430
import software.amazon.awssdk.services.cloudwatch.model.GetMetricStatisticsRequest;
1531
import software.amazon.awssdk.services.cloudwatch.model.Statistic;
16-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.Configuration;
17-
import software.amazon.awssdk.services.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
18-
import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.EnvironmentProvider;
19-
import software.amazon.awssdk.services.cloudwatchlogs.emf.logger.MetricsLogger;
20-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.DimensionSet;
21-
import software.amazon.awssdk.services.cloudwatchlogs.emf.model.Unit;
32+
import software.amazon.cloudwatchlogs.emf.config.Configuration;
33+
import software.amazon.cloudwatchlogs.emf.config.EnvironmentConfigurationProvider;
34+
import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
35+
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
36+
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
37+
import software.amazon.cloudwatchlogs.emf.model.Unit;
2238

2339
public class MetricsLoggerIntegrationTest {
2440

‎src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/Constants.java‎ renamed to ‎src/main/java/software/amazon/cloudwatchlogs/emf/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package software.amazon.awssdk.services.cloudwatchlogs.emf;
17+
package software.amazon.cloudwatchlogs.emf;
1818

1919
public class Constants {
2020
public static final int DEFAULT_AGENT_PORT = 25888;

‎src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/Configuration.java‎ renamed to ‎src/main/java/software/amazon/cloudwatchlogs/emf/config/Configuration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
17+
package software.amazon.cloudwatchlogs.emf.config;
1818

1919
import java.util.Optional;
2020
import lombok.AllArgsConstructor;
2121
import lombok.NoArgsConstructor;
2222
import lombok.Setter;
23-
import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments;
24-
import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils;
23+
import software.amazon.cloudwatchlogs.emf.environment.Environments;
24+
import software.amazon.cloudwatchlogs.emf.util.StringUtils;
2525

2626
/** Configuration for EMF logger. */
2727
@AllArgsConstructor

‎src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/ConfigurationKeys.java‎ renamed to ‎src/main/java/software/amazon/cloudwatchlogs/emf/config/ConfigurationKeys.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
17+
package software.amazon.cloudwatchlogs.emf.config;
1818

1919
/** The key of configurations used by EMF logger. */
2020
public class ConfigurationKeys {

‎src/main/java/software/amazon/awssdk/services/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java‎ renamed to ‎src/main/java/software/amazon/cloudwatchlogs/emf/config/EnvironmentConfigurationProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package software.amazon.awssdk.services.cloudwatchlogs.emf.config;
17+
package software.amazon.cloudwatchlogs.emf.config;
1818

19-
import software.amazon.awssdk.services.cloudwatchlogs.emf.environment.Environments;
20-
import software.amazon.awssdk.services.cloudwatchlogs.emf.util.StringUtils;
19+
import software.amazon.cloudwatchlogs.emf.environment.Environments;
20+
import software.amazon.cloudwatchlogs.emf.util.StringUtils;
2121

2222
/** Loads configuration from environment variables. */
2323
public class EnvironmentConfigurationProvider {

0 commit comments

Comments
 (0)