Skip to content

Commit 83b2884

Browse files
authored
eliminated use of Java 14 instanceof pattern matching (#233)
1 parent 9656949 commit 83b2884

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public final class ThreadGrouper {
1313
// FIXME doesn't actually do any grouping, but should be safe for now
1414
public Optional<String> groupedName(RecordedEvent ev) {
1515
Object thisField = ev.getValue("eventThread");
16-
if (thisField instanceof RecordedThread thread) {
16+
if (thisField instanceof RecordedThread) {
17+
RecordedThread thread = (RecordedThread) thisField;
1718
return Optional.of(thread.getJavaName());
1819
}
1920
return Optional.empty();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ private void recordValues(RecordedEvent before, RecordedEvent after) {
108108
memoryHistogram.record(after.getLong(HEAP_USED), ATTR_MEMORY_USED);
109109
}
110110
if (after.hasField(HEAP_SPACE)) {
111-
if (after.getValue(HEAP_SPACE) instanceof RecordedObject heapSpace) {
111+
Object heapSpaceValue = after.getValue(HEAP_SPACE);
112+
if (heapSpaceValue instanceof RecordedObject) {
113+
RecordedObject heapSpace = (RecordedObject) heapSpaceValue;
112114
if (heapSpace.hasField(COMMITTED_SIZE)) {
113115
memoryHistogram.record(heapSpace.getLong(COMMITTED_SIZE), ATTR_MEMORY_COMMITTED);
114116
}

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

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,31 @@ public void accept(RecordedEvent ev) {
100100
}
101101

102102
private void recordValues(RecordedEvent before, RecordedEvent after) {
103-
if (after.hasField("edenSpace")
104-
&& after.getValue("edenSpace") instanceof RecordedObject edenSpace) {
105-
memoryHistogram.record(edenSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE);
106-
if (before.hasField("edenSpace")
107-
&& before.getValue("edenSpace") instanceof RecordedObject beforeSpace) {
108-
if (edenSpace.hasField("size") && beforeSpace.hasField("size")) {
109-
memoryHistogram.record(
110-
edenSpace.getLong("size") - beforeSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE_DELTA);
103+
if (after.hasField("edenSpace")) {
104+
Object edenSpaceObj = after.getValue("edenSpace");
105+
if (edenSpaceObj instanceof RecordedObject) {
106+
RecordedObject edenSpace = (RecordedObject) edenSpaceObj;
107+
memoryHistogram.record(edenSpace.getLong("size"), ATTR_MEMORY_EDEN_SIZE);
108+
if (before.hasField("edenSpace")) {
109+
Object beforeSpaceObj = before.getValue("edenSpace");
110+
if (beforeSpaceObj instanceof RecordedObject) {
111+
RecordedObject beforeSpace = (RecordedObject) beforeSpaceObj;
112+
if (edenSpace.hasField("size") && beforeSpace.hasField("size")) {
113+
memoryHistogram.record(
114+
edenSpace.getLong("size") - beforeSpace.getLong("size"),
115+
ATTR_MEMORY_EDEN_SIZE_DELTA);
116+
}
117+
}
111118
}
112119
}
113120
}
114-
if (after.hasField("fromSpace")
115-
&& after.getValue("fromSpace") instanceof RecordedObject fromSpace) {
116-
if (fromSpace.hasField("size")) {
117-
memoryHistogram.record(fromSpace.getLong("size"), ATTR_MEMORY_SURVIVOR_SIZE);
121+
if (after.hasField("fromSpace")) {
122+
Object fromSpaceObj = after.getValue("fromSpace");
123+
if (after.getValue("fromSpace") instanceof RecordedObject) {
124+
RecordedObject fromSpace = (RecordedObject) fromSpaceObj;
125+
if (fromSpace.hasField("size")) {
126+
memoryHistogram.record(fromSpace.getLong("size"), ATTR_MEMORY_SURVIVOR_SIZE);
127+
}
118128
}
119129
}
120130
}

0 commit comments

Comments
 (0)