Skip to content

Commit 049e64a

Browse files
committed
Add GraalVM files and update MetricsUtils with LambdaEnvironment.
1 parent 9806032 commit 049e64a

File tree

5 files changed

+556
-1
lines changed

5 files changed

+556
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright 2023 Amazon.com, Inc. or its affiliates.
3+
* Licensed under the Apache License, Version 2.0 (the
4+
* "License"); you may not use this file except in compliance
5+
* with the License. You may obtain a copy of the License at
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
* Unless required by applicable law or agreed to in writing, software
8+
* distributed under the License is distributed on an "AS IS" BASIS,
9+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
* See the License for the specific language governing permissions and
11+
* limitations under the License.
12+
*
13+
*/
14+
15+
package software.amazon.cloudwatchlogs.emf.environment;
16+
17+
import java.util.concurrent.CompletableFuture;
18+
19+
public class LambdaEnvironmentProvider extends EnvironmentProvider {
20+
@Override
21+
public CompletableFuture<Environment> resolveEnvironment() {
22+
return CompletableFuture.completedFuture(new LambdaEnvironment());
23+
}
24+
}

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/MetricsUtils.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
import java.util.Arrays;
2424
import java.util.Optional;
2525
import java.util.function.Consumer;
26+
2627
import software.amazon.cloudwatchlogs.emf.config.SystemWrapper;
2728
import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
29+
import software.amazon.cloudwatchlogs.emf.environment.LambdaEnvironmentProvider;
2830
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
2931
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
3032
import software.amazon.cloudwatchlogs.emf.model.MetricsContext;
@@ -38,7 +40,7 @@
3840
* {@see Metrics}
3941
*/
4042
public final class MetricsUtils {
41-
private static final MetricsLogger metricsLogger = new MetricsLogger();
43+
private static final MetricsLogger metricsLogger = new MetricsLogger(new LambdaEnvironmentProvider());
4244
private static DimensionSet[] defaultDimensions;
4345

4446
private MetricsUtils() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
[
2+
{
3+
"name": "java.lang.String",
4+
"methods": [
5+
{ "name": "lastIndexOf", "parameterTypes": ["int"] },
6+
{ "name": "substring", "parameterTypes": ["int"] }
7+
]
8+
},
9+
{
10+
"name": "java.lang.System",
11+
"methods": [
12+
{ "name": "getProperty", "parameterTypes": ["java.lang.String"] },
13+
{ "name": "setProperty", "parameterTypes": ["java.lang.String", "java.lang.String"] }
14+
]
15+
},
16+
{
17+
"name": "org.apache.maven.surefire.booter.ForkedBooter",
18+
"methods": [{ "name": "main", "parameterTypes": ["java.lang.String[]"] }]
19+
},
20+
{
21+
"name": "sun.instrument.InstrumentationImpl",
22+
"methods": [
23+
{ "name": "<init>", "parameterTypes": ["long", "boolean", "boolean", "boolean"] },
24+
{ "name": "loadClassAndCallAgentmain", "parameterTypes": ["java.lang.String", "java.lang.String"] },
25+
{ "name": "loadClassAndCallPremain", "parameterTypes": ["java.lang.String", "java.lang.String"] },
26+
{
27+
"name": "transform",
28+
"parameterTypes": [
29+
"java.lang.Module",
30+
"java.lang.ClassLoader",
31+
"java.lang.String",
32+
"java.lang.Class",
33+
"java.security.ProtectionDomain",
34+
"byte[]",
35+
"boolean"
36+
]
37+
}
38+
]
39+
},
40+
{
41+
"name": "sun.management.VMManagementImpl",
42+
"fields": [
43+
{ "name": "compTimeMonitoringSupport" },
44+
{ "name": "currentThreadCpuTimeSupport" },
45+
{ "name": "objectMonitorUsageSupport" },
46+
{ "name": "otherThreadCpuTimeSupport" },
47+
{ "name": "remoteDiagnosticCommandsSupport" },
48+
{ "name": "synchronizerUsageSupport" },
49+
{ "name": "threadAllocatedMemorySupport" },
50+
{ "name": "threadContentionMonitoringSupport" }
51+
]
52+
}
53+
]

0 commit comments

Comments
 (0)