Skip to content

Commit b6fb859

Browse files
author
Vishaka Sekar
committed
Merge pull request #1 in AE/aws-lambda-monitoring-extension from v2.0.4 to master
* commit 'de9136928239c59170daa82effb9bfdf0034699a': ACE-980 moving to commons 2.2.3 ACE-980 Logger Update. moving to commons version 2.2.2
2 parents 2789680 + de91369 commit b6fb859

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#### 2.0.4
2+
1. Updated aws-cloudwatch-exts-commons to 2.2.3
3+
14
#### 2.0.3
25
1. Added controllerInfo section and health check flag in config.yml
36
2. Updated aws-cloudwatch-exts-commons to 2.2.1

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 AppDynamics LLC and its affiliates
1+
Copyright 2020 AppDynamics LLC and its affiliates
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ Always feel free to fork and contribute any changes directly here on [GitHub](ht
220220
## Version
221221
| Name | Version |
222222
|--------------------------|------------|
223-
|Extension Version |2.0.3 |
223+
|Extension Version |2.0.4 |
224224
|Controller Compatibility |4.4 or Later|
225225
|Agent Compatibility | 4.5.13 or later|
226-
|Last Update |09 March, 2020 |
226+
|Last Update |29 Apr, 2020 |
227227
List of changes to this extension can be found [here](https://github.com/Appdynamics/aws-lambda-monitoring-extension/blob/master/CHANGELOG.md)

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>com.appdynamics.extensions</groupId>
1313
<artifactId>aws-lambda-monitoring-extension</artifactId>
14-
<version>2.0.3</version>
14+
<version>2.0.4</version>
1515
<name>AWS Lambda Monitoring Extension</name>
1616

1717
<properties>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.appdynamics.extensions</groupId>
3333
<artifactId>aws-cloudwatch-exts-commons</artifactId>
34-
<version>2.2.1</version>
34+
<version>2.2.3</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>junit</groupId>

src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMetricsProcessor.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
import com.appdynamics.extensions.aws.metric.processors.MetricsProcessor;
1919
import com.appdynamics.extensions.aws.metric.processors.MetricsProcessorHelper;
2020
import com.appdynamics.extensions.aws.predicate.MultiDimensionPredicate;
21+
import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
2122
import com.google.common.collect.Lists;
22-
import org.apache.log4j.Logger;
23+
import org.slf4j.Logger;
24+
2325

2426
import java.util.HashMap;
2527
import java.util.List;
@@ -32,7 +34,7 @@
3234
*/
3335
public class LambdaMetricsProcessor implements MetricsProcessor {
3436

35-
private static final Logger LOGGER = Logger.getLogger(LambdaMetricsProcessor.class);
37+
private static final Logger LOGGER = ExtensionsLoggerFactory.getLogger(LambdaMetricsProcessor.class);
3638
private static final String NAMESPACE = "AWS/Lambda";
3739
private List<IncludeMetric> includeMetrics;
3840
private List<Dimension> dimensions;

src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import com.appdynamics.extensions.aws.collectors.NamespaceMetricStatisticsCollector;
1313
import com.appdynamics.extensions.aws.config.Configuration;
1414
import com.appdynamics.extensions.aws.metric.processors.MetricsProcessor;
15-
import org.apache.log4j.Logger;
15+
import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
16+
import org.slf4j.Logger;
17+
1618

1719
import java.util.ArrayList;
1820
import java.util.HashMap;
@@ -26,7 +28,7 @@
2628
*/
2729
public class LambdaMonitor extends SingleNamespaceCloudwatchMonitor<Configuration> {
2830

29-
private static final Logger LOGGER = Logger.getLogger("LambdaMonitor.class");
31+
private static final Logger LOGGER = ExtensionsLoggerFactory.getLogger("LambdaMonitor.class");
3032

3133
private static final String DEFAULT_METRIC_PREFIX = String.format("%s%s%s%s",
3234
"Custom Metrics", METRIC_PATH_SEPARATOR, "Amazon Lambda", METRIC_PATH_SEPARATOR);
@@ -69,16 +71,16 @@ protected NamespaceMetricStatisticsCollector getNamespaceMetricsCollector(Config
6971
.build();
7072
}
7173

72-
@Override
73-
protected Logger getLogger() {
74-
return LOGGER;
75-
}
76-
7774
private MetricsProcessor createMetricsProcessor(Configuration config) {
7875
return new LambdaMetricsProcessor(
7976
config.getMetricsConfig().getIncludeMetrics(),
8077
config.getDimensions());
8178
}
79+
80+
@Override
81+
protected Logger getLogger() {
82+
return LOGGER;
83+
}
8284
/*
8385
public static void main(String[] args) throws TaskExecutionException {
8486

0 commit comments

Comments
 (0)