open-telemetry
/
opentelemetry-java-contrib
mirror of https://github.com/open-telemetry/opentelemetry-java-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eliminated use of Java 14 instanceof pattern matching (#233)

This commit is contained in:
Otmar Ertl 2022-02-15 19:18:35 +01:00 committed by GitHub
parent 965694939c
commit 83b2884e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/ThreadGrouper.java
View File

@ -13,7 +13,8 @@ public final class ThreadGrouper {
// FIXME doesn't actually do any grouping, but should be safe for now // FIXME doesn't actually do any grouping, but should be safe for now
public Optional<String> groupedName(RecordedEvent ev) { public Optional<String> groupedName(RecordedEvent ev) {
Object thisField = ev.getValue("eventThread"); Object thisField = ev.getValue("eventThread");
if (thisField instanceof RecordedThread thread) { if (thisField instanceof RecordedThread) {
RecordedThread thread = (RecordedThread) thisField;
return Optional.of(thread.getJavaName()); return Optional.of(thread.getJavaName());
} }
return Optional.empty(); return Optional.empty();

4
jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/GCHeapSummaryHandler.java
View File

@ -108,7 +108,9 @@ public final class GCHeapSummaryHandler implements RecordedEventHandler {
memoryHistogram.record(after.getLong(HEAP_USED), ATTR_MEMORY_USED); memoryHistogram.record(after.getLong(HEAP_USED), ATTR_MEMORY_USED);
} }
if (after.hasField(HEAP_SPACE)) { if (after.hasField(HEAP_SPACE)) {
if (after.getValue(HEAP_SPACE) instanceof RecordedObject heapSpace) { Object heapSpaceValue = after.getValue(HEAP_SPACE);
if (heapSpaceValue instanceof RecordedObject) {
RecordedObject heapSpace = (RecordedObject) heapSpaceValue;
if (heapSpace.hasField(COMMITTED_SIZE)) { if (heapSpace.hasField(COMMITTED_SIZE)) {
memoryHistogram.record(heapSpace.getLong(COMMITTED_SIZE), ATTR_MEMORY_COMMITTED); memoryHistogram.record(heapSpace.getLong(COMMITTED_SIZE), ATTR_MEMORY_COMMITTED);
} }

24
jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/internal/memory/ParallelHeapSummaryHandler.java
View File

@ -100,22 +100,32 @@ public final class ParallelHeapSummaryHandler implements RecordedEventHandler {
} }
private void recordValues(RecordedEvent before, RecordedEvent after) { private void recordValues(RecordedEvent before, RecordedEvent after) {
if (after.hasField("edenSpace") if (after.hasField("edenSpace")) {
&& after.getValue("edenSpace") instanceof RecordedObject edenSpace) { Object edenSpaceObj = after.getValue("edenSpace");
if (edenSpaceObj instanceof RecordedObject) {
RecordedObject edenSpace = (RecordedObject) edenSpaceObj;
memoryHistogram.record(edenSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE); memoryHistogram.record(edenSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE);
if (before.hasField("edenSpace") if (before.hasField("edenSpace")) {
&& before.getValue("edenSpace") instanceof RecordedObject beforeSpace) { Object beforeSpaceObj = before.getValue("edenSpace");
if (beforeSpaceObj instanceof RecordedObject) {
RecordedObject beforeSpace = (RecordedObject) beforeSpaceObj;
if (edenSpace.hasField("size") && beforeSpace.hasField("size")) { if (edenSpace.hasField("size") && beforeSpace.hasField("size")) {
memoryHistogram.record( memoryHistogram.record(
edenSpace.getLong("size") - beforeSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE_DELTA); edenSpace.getLong("size") - beforeSpace.getLong("size"),
ATTR_MEMORY_EDEN_SIZE_DELTA);
} }
} }
} }
if (after.hasField("fromSpace") }
&& after.getValue("fromSpace") instanceof RecordedObject fromSpace) { }
if (after.hasField("fromSpace")) {
Object fromSpaceObj = after.getValue("fromSpace");
if (after.getValue("fromSpace") instanceof RecordedObject) {
RecordedObject fromSpace = (RecordedObject) fromSpaceObj;
if (fromSpace.hasField("size")) { if (fromSpace.hasField("size")) {
memoryHistogram.record(fromSpace.getLong("size"), ATTR_MEMORY_SURVIVOR_SIZE); memoryHistogram.record(fromSpace.getLong("size"), ATTR_MEMORY_SURVIVOR_SIZE);
} }
} }
} }
}
} }