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

Fix units for some metrics #140

Merged
merged 3 commits into from
Dec 1, 2021
Merged

Fix units for some metrics #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aece6b8
Fix units for some metrics
kittylyst Nov 24, 2021
24e8b8f
These are actually bytes and formatted based on size
kittylyst Nov 30, 2021
16545c0
Merge branch 'main' into check_units
kittylyst Nov 30, 2021
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
3 changes: 2 additions & 1 deletion jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ public final class Constants {
private Constants() {}

public static final String ONE = "1";
public static final String KILOBYTES = "kb";
public static final String HERTZ = "Hz";
public static final String BYTES = "B";
public static final String MILLISECONDS = "ms";
public static final String PERCENTAGE = "%age";
public static final String READ = "read";
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/ContextSwitchRateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.contrib.jfr.metrics.internal.cpu;

import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ONE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.HERTZ;

import io.opentelemetry.api.metrics.*;
import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler;
Expand All @@ -28,7 +28,7 @@ public ContextSwitchRateHandler init() {
otelMeter
.upDownCounterBuilder(METRIC_NAME)
.ofDoubles()
.setUnit(ONE)
.setUnit(HERTZ)
.buildWithCallback(codm -> codm.observe(value));
return this;
}
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/io/opentelemetry/contrib/jfr/metrics/internal/cpu/OverallCPULoadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_CPU_USAGE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.MACHINE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ONE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.PERCENTAGE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.SYSTEM;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.USER;

Expand Down Expand Up @@ -43,7 +44,7 @@ public OverallCPULoadHandler init() {
var attr = Attributes.of(ATTR_CPU_USAGE, USER);
var builder = otelMeter.histogramBuilder(METRIC_NAME);
builder.setDescription(DESCRIPTION);
builder.setUnit(ONE);
builder.setUnit(PERCENTAGE);
userHistogram = builder.build().bind(attr);

attr = Attributes.of(ATTR_CPU_USAGE, SYSTEM);
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/GCHeapSummaryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package io.opentelemetry.contrib.jfr.metrics.internal.memory;

import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_MEMORY_USAGE;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.COMMITTED;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.KILOBYTES;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.USED;

import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -57,13 +57,13 @@ public GCHeapSummaryHandler init() {
var attr = Attributes.of(ATTR_MEMORY_USAGE, USED);
builder = otelMeter.histogramBuilder(METRIC_NAME_MEMORY);
builder.setDescription(DESCRIPTION);
builder.setUnit(KILOBYTES);
builder.setUnit(BYTES);
usedHistogram = builder.build().bind(attr);

attr = Attributes.of(ATTR_MEMORY_USAGE, COMMITTED);
builder = otelMeter.histogramBuilder(METRIC_NAME_MEMORY);
builder.setDescription(DESCRIPTION);
builder.setUnit(KILOBYTES);
builder.setUnit(BYTES);
committedHistogram = builder.build().bind(attr);

return this;
Expand Down
4 changes: 2 additions & 2 deletions ...emetry/contrib/jfr/metrics/internal/memory/PerThreadObjectAllocationInNewTLABHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ARENA_NAME;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.BoundDoubleHistogram;
import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.contrib.jfr.metrics.internal.Constants;
import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler;
import jdk.jfr.consumer.RecordedEvent;

Expand All @@ -35,7 +35,7 @@ public PerThreadObjectAllocationInNewTLABHandler init() {
var attr = Attributes.of(ATTR_THREAD_NAME, threadName, ATTR_ARENA_NAME, TLAB);
var builder = otelMeter.histogramBuilder(METRIC_NAME_MEMORY_ALLOCATION);
builder.setDescription(DESCRIPTION);
builder.setUnit(Constants.KILOBYTES);
builder.setUnit(BYTES);
histogram = builder.build().bind(attr);
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions ...etry/contrib/jfr/metrics/internal/memory/PerThreadObjectAllocationOutsideTLABHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_ARENA_NAME;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.ATTR_THREAD_NAME;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.BYTES;
import static io.opentelemetry.contrib.jfr.metrics.internal.Constants.METRIC_NAME_MEMORY_ALLOCATION;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.BoundDoubleHistogram;
import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.contrib.jfr.metrics.internal.Constants;
import io.opentelemetry.contrib.jfr.metrics.internal.RecordedEventHandler;
import jdk.jfr.consumer.RecordedEvent;

Expand All @@ -35,7 +35,7 @@ public PerThreadObjectAllocationOutsideTLABHandler init() {
var attr = Attributes.of(ATTR_THREAD_NAME, threadName, ATTR_ARENA_NAME, MAIN);
var builder = otelMeter.histogramBuilder(METRIC_NAME_MEMORY_ALLOCATION);
builder.setDescription(DESCRIPTION);
builder.setUnit(Constants.KILOBYTES);
builder.setUnit(BYTES);
histogram = builder.build().bind(attr);
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion ...va/io/opentelemetry/contrib/jfr/metrics/internal/network/PerThreadNetworkReadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public PerThreadNetworkReadHandler init() {

var builder = otelMeter.histogramBuilder(METRIC_NAME_BYTES);
builder.setDescription(DESCRIPTION_BYTES);
builder.setUnit(Constants.KILOBYTES);
builder.setUnit(Constants.BYTES);
bytesHistogram = builder.build().bind(attr);

builder = otelMeter.histogramBuilder(METRIC_NAME_DURATION);
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/opentelemetry/contrib/jfr/metrics/internal/network/PerThreadNetworkWriteHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public PerThreadNetworkWriteHandler init() {

var builder = otelMeter.histogramBuilder(METRIC_NAME_BYTES);
builder.setDescription(DESCRIPTION_BYTES);
builder.setUnit(Constants.KILOBYTES);
builder.setUnit(Constants.BYTES);
bytesHistogram = builder.build().bind(attr);

builder = otelMeter.histogramBuilder(METRIC_NAME_DURATION);
Expand Down