Skip to content

Commit 01a4486

Browse files
committed
Enable runtime metrics by default
1 parent dda628b commit 01a4486

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ private boolean isApplicationSignalsEnabled(ConfigProperties configProps) {
104104
}
105105

106106
private boolean isApplicationSignalsRuntimeEnabled(ConfigProperties configProps) {
107-
return false;
107+
return isApplicationSignalsEnabled(configProps)
108+
&& configProps.getBoolean(APPLICATION_SIGNALS_RUNTIME_ENABLED_CONFIG, true);
108109
}
109110

110111
private Map<String, String> customizeProperties(ConfigProperties configProps) {

instrumentation/jmx-metrics/src/main/resources/jmx/rules/jvm.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ rules:
5858
metricAttribute:
5959
name: param(name)
6060
mapping:
61+
CollectionUsage.used:
62+
metric: used_after_last_gc
63+
desc: Memory used after the most recent gc event
6164
Usage.init:
6265
metric: init
6366
desc: The initial amount of memory that the JVM requests from the operating system for the memory pool
@@ -81,37 +84,49 @@ rules:
8184
metric: jvm.daemon_threads.count
8285
desc: Number of daemon threads
8386
- bean: java.lang:type=OperatingSystem
84-
type: gauge
8587
mapping:
8688
TotalSwapSpaceSize:
8789
metric: jvm.system.swap.space.total
90+
type: gauge
8891
desc: The host swap memory size in bytes
8992
unit: by
9093
FreeSwapSpaceSize:
9194
metric: jvm.system.swap.space.free
95+
type: gauge
9296
desc: The amount of available swap memory in bytes
9397
unit: by
9498
TotalPhysicalMemorySize:
9599
metric: jvm.system.physical.memory.total
100+
type: gauge
96101
desc: The total physical memory size in host
97102
unit: by
98103
FreePhysicalMemorySize:
99104
metric: jvm.system.physical.memory.free
105+
type: gauge
100106
desc: The amount of free physical memory in host
101107
unit: by
102108
AvailableProcessors:
103109
metric: jvm.system.available.processors
110+
type: gauge
104111
desc: The number of available processors
105112
unit: "1"
106113
SystemCpuLoad:
107114
metric: jvm.system.cpu.utilization
115+
type: gauge
108116
desc: The current load of CPU in host
109117
unit: "1"
118+
ProcessCpuTime:
119+
metric: jvm.cpu.time
120+
type: counter
121+
unit: ns
122+
desc: CPU time used
110123
ProcessCpuLoad:
111124
metric: jvm.cpu.recent_utilization
125+
type: gauge
112126
unit: "1"
113127
desc: Recent CPU utilization for the process
114128
OpenFileDescriptorCount:
115129
metric: jvm.open_file_descriptor.count
130+
type: gauge
116131
desc: The number of opened file descriptors
117132
unit: "1"

0 commit comments

Comments
 (0)