Skip to content

Commit 960e102

Browse files
committed
refactor: remove ThreadGrouper as well, since it is now unused
See: [#14047](#14047)
1 parent f9b198d commit 960e102

File tree

7 files changed

+10
-49
lines changed

7 files changed

+10
-49
lines changed

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/HandlerRegistry.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.api.metrics.MeterBuilder;
1111
import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
1212
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
13-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1413
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.buffer.DirectBufferStatisticsHandler;
1514
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.classes.ClassesLoadedHandler;
1615
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.container.ContainerConfigurationHandler;
@@ -84,17 +83,16 @@ static List<RecordedEventHandler> getHandlers(
8483
}
8584
}
8685

87-
ThreadGrouper grouper = new ThreadGrouper();
8886
List<RecordedEventHandler> basicHandlers =
8987
List.of(
90-
new ObjectAllocationInNewTlabHandler(meter, grouper),
91-
new ObjectAllocationOutsideTlabHandler(meter, grouper),
92-
new NetworkReadHandler(meter, grouper),
93-
new NetworkWriteHandler(meter, grouper),
88+
new ObjectAllocationInNewTlabHandler(meter),
89+
new ObjectAllocationOutsideTlabHandler(meter),
90+
new NetworkReadHandler(meter),
91+
new NetworkWriteHandler(meter),
9492
new ContextSwitchRateHandler(meter),
9593
new OverallCpuLoadHandler(meter),
9694
new ContainerConfigurationHandler(meter),
97-
new LongLockHandler(meter, grouper),
95+
new LongLockHandler(meter),
9896
new ThreadCountHandler(meter),
9997
new ClassesLoadedHandler(meter),
10098
new MetaspaceSummaryHandler(meter),

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/ThreadGrouper.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/cpu/LongLockHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
1313
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.DurationUtil;
1414
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
15-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1615
import java.time.Duration;
1716
import java.util.Optional;
1817
import jdk.jfr.consumer.RecordedEvent;
@@ -31,7 +30,7 @@ public final class LongLockHandler implements RecordedEventHandler {
3130
private final DoubleHistogram histogram;
3231
private final Attributes attributes;
3332

34-
public LongLockHandler(Meter meter, ThreadGrouper grouper) {
33+
public LongLockHandler(Meter meter) {
3534
super();
3635
histogram =
3736
meter

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/memory/ObjectAllocationInNewTlabHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.opentelemetry.instrumentation.runtimemetrics.java17.JfrFeature;
1212
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
1313
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
14-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1514
import jdk.jfr.consumer.RecordedEvent;
1615

1716
/**
@@ -28,7 +27,7 @@ public final class ObjectAllocationInNewTlabHandler implements RecordedEventHand
2827
private final LongHistogram histogram;
2928
private final Attributes attributes;
3029

31-
public ObjectAllocationInNewTlabHandler(Meter meter, ThreadGrouper grouper) {
30+
public ObjectAllocationInNewTlabHandler(Meter meter) {
3231
super();
3332
histogram =
3433
meter

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/memory/ObjectAllocationOutsideTlabHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.opentelemetry.instrumentation.runtimemetrics.java17.JfrFeature;
1212
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
1313
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
14-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1514
import jdk.jfr.consumer.RecordedEvent;
1615

1716
/**
@@ -28,7 +27,7 @@ public final class ObjectAllocationOutsideTlabHandler implements RecordedEventHa
2827
private final LongHistogram histogram;
2928
private final Attributes attributes;
3029

31-
public ObjectAllocationOutsideTlabHandler(Meter meter, ThreadGrouper grouper) {
30+
public ObjectAllocationOutsideTlabHandler(Meter meter) {
3231
super();
3332
histogram =
3433
meter

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/network/NetworkReadHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
1414
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.DurationUtil;
1515
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
16-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1716
import jdk.jfr.consumer.RecordedEvent;
1817

1918
/**
@@ -28,7 +27,7 @@ public final class NetworkReadHandler implements RecordedEventHandler {
2827
private final DoubleHistogram durationHistogram;
2928
private final Attributes attributes;
3029

31-
public NetworkReadHandler(Meter meter, ThreadGrouper nameNormalizer) {
30+
public NetworkReadHandler(Meter meter) {
3231
super();
3332
bytesHistogram =
3433
meter

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/network/NetworkWriteHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.Constants;
1414
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.DurationUtil;
1515
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
16-
import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.ThreadGrouper;
1716
import jdk.jfr.consumer.RecordedEvent;
1817

1918
// jdk.SocketWrite {
@@ -46,7 +45,7 @@ public final class NetworkWriteHandler implements RecordedEventHandler {
4645
private final DoubleHistogram durationHistogram;
4746
private final Attributes attributes;
4847

49-
public NetworkWriteHandler(Meter meter, ThreadGrouper nameNormalizer) {
48+
public NetworkWriteHandler(Meter meter) {
5049
super();
5150
bytesHistogram =
5251
meter

0 commit comments

Comments
 (0)