Skip to content

Commit 459cbc4

Browse files
akrambekakrambek
authored
Log worker usage instead of utilization (#1515)
1 parent c7128b5 commit 459cbc4

File tree

11 files changed

+36
-38
lines changed

11 files changed

+36
-38
lines changed

‎runtime/binding-tcp/src/main/java/io/aklivity/zilla/runtime/binding/tcp/internal/TcpUsageTracker.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public void released()
6060
private void record(
6161
int newUsage)
6262
{
63-
final int newUsageAsPercentage = newUsage * 100 / capacity;
64-
65-
recordUsage.accept(newUsageAsPercentage);
63+
recordUsage.accept(newUsage);
6664
}
6765
}

‎runtime/binding-tcp/src/test/java/io/aklivity/zilla/runtime/binding/tcp/internal/streams/ClientIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public void shouldWriteDataAfterReceiveEnd() throws Exception
352352
@Configure(name = ENGINE_WORKER_CAPACITY_NAME, value = "2")
353353
public void shouldResetWhenConnectionsExceeded() throws Exception
354354
{
355-
final LongSupplier utilization = engine.utilization();
355+
final LongSupplier usage = engine.usage();
356356

357357
try (ServerSocketChannel server = ServerSocketChannel.open())
358358
{
@@ -363,7 +363,7 @@ public void shouldResetWhenConnectionsExceeded() throws Exception
363363

364364
ByteBuffer buf = ByteBuffer.allocate(0);
365365

366-
while (utilization.getAsLong() != 100L)
366+
while (usage.getAsLong() != 2L)
367367
{
368368
Thread.onSpinWait();
369369
}
@@ -373,7 +373,7 @@ public void shouldResetWhenConnectionsExceeded() throws Exception
373373
client1.read(buf);
374374
client1.close();
375375

376-
while (utilization.getAsLong() != 50L)
376+
while (usage.getAsLong() != 1L)
377377
{
378378
Thread.onSpinWait();
379379
}
@@ -383,7 +383,7 @@ public void shouldResetWhenConnectionsExceeded() throws Exception
383383
client2.read(buf);
384384
client2.close();
385385

386-
while (utilization.getAsLong() != 100L)
386+
while (usage.getAsLong() != 2L)
387387
{
388388
Thread.onSpinWait();
389389
}

‎runtime/binding-tcp/src/test/java/io/aklivity/zilla/runtime/binding/tcp/internal/streams/ServerIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public void shouldReceiveDataAfterSendingEnd() throws Exception
382382
@Configure(name = ENGINE_WORKER_CAPACITY_NAME, value = "4")
383383
public void shouldRejectOnConnectionLimit() throws Exception
384384
{
385-
final LongSupplier utilization = engine.utilization();
385+
final LongSupplier usage = engine.usage();
386386

387387
k3po.start();
388388

@@ -403,7 +403,7 @@ public void shouldRejectOnConnectionLimit() throws Exception
403403
k3po.awaitBarrier("CONNECTION_ACCEPTED_3");
404404
k3po.awaitBarrier("CONNECTION_ACCEPTED_4");
405405

406-
while (utilization.getAsLong() != 100L)
406+
while (usage.getAsLong() != 4L)
407407
{
408408
Thread.onSpinWait();
409409
}
@@ -421,7 +421,7 @@ public void shouldRejectOnConnectionLimit() throws Exception
421421

422422
k3po.awaitBarrier("CLOSED");
423423

424-
while (utilization.getAsLong() != 0L)
424+
while (usage.getAsLong() != 0L)
425425
{
426426
Thread.onSpinWait();
427427
}
@@ -443,7 +443,7 @@ public void shouldRejectOnConnectionLimit() throws Exception
443443
k3po.awaitBarrier("CONNECTION_ACCEPTED_8");
444444
k3po.awaitBarrier("CONNECTION_ACCEPTED_9");
445445

446-
while (utilization.getAsLong() != 100L)
446+
while (usage.getAsLong() != 4L)
447447
{
448448
Thread.onSpinWait();
449449
}

‎runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/metrics/EngineMetricGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class EngineMetricGroup implements MetricGroup
2929
public static final String NAME = "engine";
3030

3131
private final Map<String, Supplier<Metric>> engineMetrics = Map.of(
32-
EngineWorkersUtilizationMetric.NAME, EngineWorkersUtilizationMetric::new,
32+
EngineWorkersUsageMetric.NAME, EngineWorkersUsageMetric::new,
3333
EngineWorkersCapacityMetric.NAME, EngineWorkersCapacityMetric::new,
3434
EngineWorkersCountMetric.NAME, EngineWorkersCountMetric::new
3535
);

‎runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/metrics/EngineWorkersUtilizationMetric.java‎ renamed to ‎runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/metrics/EngineWorkersUsageMetric.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import io.aklivity.zilla.runtime.engine.metrics.Metric;
2020
import io.aklivity.zilla.runtime.engine.metrics.MetricContext;
2121

22-
public final class EngineWorkersUtilizationMetric implements Metric
22+
public final class EngineWorkersUsageMetric implements Metric
2323
{
24-
public static final String NAME = String.format("%s.%s", EngineMetricGroup.NAME, "workers.utilization");
24+
public static final String NAME = String.format("%s.%s", EngineMetricGroup.NAME, "workers.usage");
2525

26-
private static final String DESCRIPTION = "Engine workers utilization";
26+
private static final String DESCRIPTION = "Engine workers usage";
2727

2828
@Override
2929
public String name()

‎runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/registry/EngineWorker.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
import io.aklivity.zilla.runtime.engine.internal.layouts.metrics.HistogramsLayout;
130130
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersCapacityMetric;
131131
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersCountMetric;
132-
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUtilizationMetric;
132+
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUsageMetric;
133133
import io.aklivity.zilla.runtime.engine.internal.poller.Poller;
134134
import io.aklivity.zilla.runtime.engine.internal.stream.StreamId;
135135
import io.aklivity.zilla.runtime.engine.internal.stream.Target;
@@ -236,7 +236,7 @@ public class EngineWorker implements EngineContext, Agent
236236
private final Int2ObjectHashMap<String> eventNames;
237237
private final Supplier<MessageReader> supplyEventReader;
238238
private final EventFormatterFactory eventFormatterFactory;
239-
private final LongSupplier utilizationMetric;
239+
private final LongSupplier usageMetric;
240240
private final boolean readonly;
241241

242242
private long initialId;
@@ -470,7 +470,7 @@ public EngineWorker(
470470
this.exportersById = new Long2ObjectHashMap<>();
471471
this.supplyEventReader = supplyEventReader;
472472
this.eventFormatterFactory = eventFormatterFactory;
473-
this.utilizationMetric = supplyGauge(NO_NAMESPACED_ID, labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME));
473+
this.usageMetric = supplyGauge(NO_NAMESPACED_ID, labels.supplyLabelId(EngineWorkersUsageMetric.NAME));
474474
}
475475

476476
public static int indexOfId(
@@ -783,7 +783,7 @@ public ConverterHandler supplyWriteConverter(
783783
@Override
784784
public LongConsumer supplyUtilizationMetric()
785785
{
786-
final int metricId = labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME);
786+
final int metricId = labels.supplyLabelId(EngineWorkersUsageMetric.NAME);
787787

788788
return supplyMetricWriter(GAUGE, NO_NAMESPACED_ID, metricId);
789789
}
@@ -904,7 +904,7 @@ public void onStart()
904904
int capacityMetricId = labels.supplyLabelId(EngineWorkersCapacityMetric.NAME);
905905
LongConsumer recordCapacity = supplyGaugeWriter(capacityMetricId);
906906

907-
int utilizationMetricId = labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME);
907+
int utilizationMetricId = labels.supplyLabelId(EngineWorkersUsageMetric.NAME);
908908
LongConsumer recordUtilization = supplyGaugeWriter(utilizationMetricId);
909909

910910
recordCount.accept(1);
@@ -962,10 +962,10 @@ public void onClose()
962962

963963
if (!readonly)
964964
{
965-
long utilization = utilizationMetric.getAsLong();
966-
if (utilization != 0L)
965+
long usage = usageMetric.getAsLong();
966+
if (usage != 0L)
967967
{
968-
throw new IllegalStateException("Engine worker utilization is non-zero: %d".formatted(utilization));
968+
throw new IllegalStateException("Engine worker usage is non-zero: %d".formatted(usage));
969969
}
970970
}
971971
}

‎runtime/engine/src/test/java/io/aklivity/zilla/runtime/engine/test/EngineRule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import io.aklivity.zilla.runtime.engine.EngineConfiguration;
6161
import io.aklivity.zilla.runtime.engine.binding.Binding;
6262
import io.aklivity.zilla.runtime.engine.ext.EngineExtContext;
63-
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUtilizationMetric;
63+
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUsageMetric;
6464
import io.aklivity.zilla.runtime.engine.test.annotation.Configuration;
6565
import io.aklivity.zilla.runtime.engine.test.annotation.Configure;
6666

@@ -256,9 +256,9 @@ public LongConsumer counterWriter(
256256
return engine.context().counterWriter(namespace, binding, metric, core);
257257
}
258258

259-
public LongSupplier utilization()
259+
public LongSupplier usage()
260260
{
261-
return gauge(NO_NAMESPACED_ID, supplyLabelId(EngineWorkersUtilizationMetric.NAME));
261+
return gauge(NO_NAMESPACED_ID, supplyLabelId(EngineWorkersUsageMetric.NAME));
262262
}
263263

264264
public int supplyLabelId(

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics.with.service.name/client.rpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connected
1919
write http:method "POST"
2020
write http:version "HTTP/1.1"
2121
write http:header "Host" "localhost:4318"
22-
write http:header "Content-Length" "1669"
22+
write http:header "Content-Length" "1657"
2323
write
2424
'{'
2525
'"resourceMetrics":[{'
@@ -90,9 +90,9 @@ write
9090
'}]'
9191
'}'
9292
'},{'
93-
'"name":"engine.workers.utilization",'
93+
'"name":"engine.workers.usage",'
9494
'"unit":"",'
95-
'"description":"Engine workers utilization",'
95+
'"description":"Engine workers usage",'
9696
'"gauge":{'
9797
'"dataPoints":[{'
9898
'"asInt":0,'

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics.with.service.name/server.rpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ connected
2020
read http:method "POST"
2121
read http:version "HTTP/1.1"
2222
read http:header "Host" "localhost:4318"
23-
read http:header "Content-Length" "1669"
23+
read http:header "Content-Length" "1657"
2424
read
2525
'{'
2626
'"resourceMetrics":[{'
@@ -91,9 +91,9 @@ read
9191
'}]'
9292
'}'
9393
'},{'
94-
'"name":"engine.workers.utilization",'
94+
'"name":"engine.workers.usage",'
9595
'"unit":"",'
96-
'"description":"Engine workers utilization",'
96+
'"description":"Engine workers usage",'
9797
'"gauge":{'
9898
'"dataPoints":[{'
9999
'"asInt":0,'

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics/client.rpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connected
1919
write http:method "POST"
2020
write http:version "HTTP/1.1"
2121
write http:header "Host" "localhost:4318"
22-
write http:header "Content-Length" "2518"
22+
write http:header "Content-Length" "2506"
2323
write
2424
'{'
2525
'"resourceMetrics":[{'
@@ -78,9 +78,9 @@ write
7878
'}]'
7979
'}'
8080
'},{'
81-
'"name":"engine.workers.utilization",'
81+
'"name":"engine.workers.usage",'
8282
'"unit":"",'
83-
'"description":"Engine workers utilization",'
83+
'"description":"Engine workers usage",'
8484
'"gauge":{'
8585
'"dataPoints":[{'
8686
'"asInt":0,'

0 commit comments

Comments
 (0)