Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename p.r.j.memory.max to p.r.j.memory.limit #6161

Merged
merged 2 commits into from
Jun 13, 2022
Merged

Rename p.r.j.memory.max to p.r.j.memory.limit #6161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cbe2df
Rename p.r.j.memory.max to p.r.j.memory.limit
jack-berg Jun 10, 2022
6a2d219
Fix build
jack-berg Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...roovy/io/opentelemetry/instrumentation/javaagent/runtimemetrics/RuntimeMetricsTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class RuntimeMetricsTest extends AgentInstrumentationSpecification {
assert getMetrics().any { it.name == "process.runtime.jvm.memory.init" }
assert getMetrics().any { it.name == "process.runtime.jvm.memory.usage" }
assert getMetrics().any { it.name == "process.runtime.jvm.memory.committed" }
assert getMetrics().any { it.name == "process.runtime.jvm.memory.max" }
assert getMetrics().any { it.name == "process.runtime.jvm.memory.limit" }
assert getMetrics().any { it.name == "process.runtime.jvm.threads.count" }
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...cs/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/MemoryPools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static void registerObservers(OpenTelemetry openTelemetry) {
.buildWithCallback(callback(poolBeans, MemoryUsage::getCommitted));

meter
.upDownCounterBuilder("process.runtime.jvm.memory.max")
.upDownCounterBuilder("process.runtime.jvm.memory.limit")
.setDescription("Measure of max obtainable memory")
.setUnit("By")
.buildWithCallback(callback(poolBeans, MemoryUsage::getMax));
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class SpringBootSmokeTest extends SmokeTest {
metrics.hasMetricsNamed("process.runtime.jvm.memory.init")
metrics.hasMetricsNamed("process.runtime.jvm.memory.usage")
metrics.hasMetricsNamed("process.runtime.jvm.memory.committed")
metrics.hasMetricsNamed("process.runtime.jvm.memory.max")
metrics.hasMetricsNamed("process.runtime.jvm.memory.limit")

cleanup:
stopTarget()
Expand Down