Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ public void released()
private void record(
int newUsage)
{
final int newUsageAsPercentage = newUsage * 100 / capacity;

recordUsage.accept(newUsageAsPercentage);
recordUsage.accept(newUsage);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public void shouldWriteDataAfterReceiveEnd() throws Exception
@Configure(name = ENGINE_WORKER_CAPACITY_NAME, value = "2")
public void shouldResetWhenConnectionsExceeded() throws Exception
{
final LongSupplier utilization = engine.utilization();
final LongSupplier usage = engine.usage();

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

ByteBuffer buf = ByteBuffer.allocate(0);

while (utilization.getAsLong() != 100L)
while (usage.getAsLong() != 2L)
{
Thread.onSpinWait();
}
Expand All @@ -373,7 +373,7 @@ public void shouldResetWhenConnectionsExceeded() throws Exception
client1.read(buf);
client1.close();

while (utilization.getAsLong() != 50L)
while (usage.getAsLong() != 1L)
{
Thread.onSpinWait();
}
Expand All @@ -383,7 +383,7 @@ public void shouldResetWhenConnectionsExceeded() throws Exception
client2.read(buf);
client2.close();

while (utilization.getAsLong() != 100L)
while (usage.getAsLong() != 2L)
{
Thread.onSpinWait();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ public void shouldReceiveDataAfterSendingEnd() throws Exception
@Configure(name = ENGINE_WORKER_CAPACITY_NAME, value = "4")
public void shouldRejectOnConnectionLimit() throws Exception
{
final LongSupplier utilization = engine.utilization();
final LongSupplier usage = engine.usage();

k3po.start();

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

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

k3po.awaitBarrier("CLOSED");

while (utilization.getAsLong() != 0L)
while (usage.getAsLong() != 0L)
{
Thread.onSpinWait();
}
Expand All @@ -443,7 +443,7 @@ public void shouldRejectOnConnectionLimit() throws Exception
k3po.awaitBarrier("CONNECTION_ACCEPTED_8");
k3po.awaitBarrier("CONNECTION_ACCEPTED_9");

while (utilization.getAsLong() != 100L)
while (usage.getAsLong() != 4L)
{
Thread.onSpinWait();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class EngineMetricGroup implements MetricGroup
public static final String NAME = "engine";

private final Map<String, Supplier<Metric>> engineMetrics = Map.of(
EngineWorkersUtilizationMetric.NAME, EngineWorkersUtilizationMetric::new,
EngineWorkersUsageMetric.NAME, EngineWorkersUsageMetric::new,
EngineWorkersCapacityMetric.NAME, EngineWorkersCapacityMetric::new,
EngineWorkersCountMetric.NAME, EngineWorkersCountMetric::new
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import io.aklivity.zilla.runtime.engine.metrics.Metric;
import io.aklivity.zilla.runtime.engine.metrics.MetricContext;

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

private static final String DESCRIPTION = "Engine workers utilization";
private static final String DESCRIPTION = "Engine workers usage";

@Override
public String name()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
import io.aklivity.zilla.runtime.engine.internal.layouts.metrics.HistogramsLayout;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersCapacityMetric;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersCountMetric;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUtilizationMetric;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUsageMetric;
import io.aklivity.zilla.runtime.engine.internal.poller.Poller;
import io.aklivity.zilla.runtime.engine.internal.stream.StreamId;
import io.aklivity.zilla.runtime.engine.internal.stream.Target;
Expand Down Expand Up @@ -236,7 +236,7 @@ public class EngineWorker implements EngineContext, Agent
private final Int2ObjectHashMap<String> eventNames;
private final Supplier<MessageReader> supplyEventReader;
private final EventFormatterFactory eventFormatterFactory;
private final LongSupplier utilizationMetric;
private final LongSupplier usageMetric;
private final boolean readonly;

private long initialId;
Expand Down Expand Up @@ -470,7 +470,7 @@ public EngineWorker(
this.exportersById = new Long2ObjectHashMap<>();
this.supplyEventReader = supplyEventReader;
this.eventFormatterFactory = eventFormatterFactory;
this.utilizationMetric = supplyGauge(NO_NAMESPACED_ID, labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME));
this.usageMetric = supplyGauge(NO_NAMESPACED_ID, labels.supplyLabelId(EngineWorkersUsageMetric.NAME));
}

public static int indexOfId(
Expand Down Expand Up @@ -783,7 +783,7 @@ public ConverterHandler supplyWriteConverter(
@Override
public LongConsumer supplyUtilizationMetric()
{
final int metricId = labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME);
final int metricId = labels.supplyLabelId(EngineWorkersUsageMetric.NAME);

return supplyMetricWriter(GAUGE, NO_NAMESPACED_ID, metricId);
}
Expand Down Expand Up @@ -904,7 +904,7 @@ public void onStart()
int capacityMetricId = labels.supplyLabelId(EngineWorkersCapacityMetric.NAME);
LongConsumer recordCapacity = supplyGaugeWriter(capacityMetricId);

int utilizationMetricId = labels.supplyLabelId(EngineWorkersUtilizationMetric.NAME);
int utilizationMetricId = labels.supplyLabelId(EngineWorkersUsageMetric.NAME);
LongConsumer recordUtilization = supplyGaugeWriter(utilizationMetricId);

recordCount.accept(1);
Expand Down Expand Up @@ -962,10 +962,10 @@ public void onClose()

if (!readonly)
{
long utilization = utilizationMetric.getAsLong();
if (utilization != 0L)
long usage = usageMetric.getAsLong();
if (usage != 0L)
{
throw new IllegalStateException("Engine worker utilization is non-zero: %d".formatted(utilization));
throw new IllegalStateException("Engine worker usage is non-zero: %d".formatted(usage));
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import io.aklivity.zilla.runtime.engine.EngineConfiguration;
import io.aklivity.zilla.runtime.engine.binding.Binding;
import io.aklivity.zilla.runtime.engine.ext.EngineExtContext;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUtilizationMetric;
import io.aklivity.zilla.runtime.engine.internal.metrics.EngineWorkersUsageMetric;
import io.aklivity.zilla.runtime.engine.test.annotation.Configuration;
import io.aklivity.zilla.runtime.engine.test.annotation.Configure;

Expand Down Expand Up @@ -256,9 +256,9 @@ public LongConsumer counterWriter(
return engine.context().counterWriter(namespace, binding, metric, core);
}

public LongSupplier utilization()
public LongSupplier usage()
{
return gauge(NO_NAMESPACED_ID, supplyLabelId(EngineWorkersUtilizationMetric.NAME));
return gauge(NO_NAMESPACED_ID, supplyLabelId(EngineWorkersUsageMetric.NAME));
}

public int supplyLabelId(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ connected
write http:method "POST"
write http:version "HTTP/1.1"
write http:header "Host" "localhost:4318"
write http:header "Content-Length" "1669"
write http:header "Content-Length" "1657"
write
'{'
'"resourceMetrics":[{'
Expand Down Expand Up @@ -90,9 +90,9 @@ write
'}]'
'}'
'},{'
'"name":"engine.workers.utilization",'
'"name":"engine.workers.usage",'
'"unit":"",'
'"description":"Engine workers utilization",'
'"description":"Engine workers usage",'
'"gauge":{'
'"dataPoints":[{'
'"asInt":0,'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ connected
read http:method "POST"
read http:version "HTTP/1.1"
read http:header "Host" "localhost:4318"
read http:header "Content-Length" "1669"
read http:header "Content-Length" "1657"
read
'{'
'"resourceMetrics":[{'
Expand Down Expand Up @@ -91,9 +91,9 @@ read
'}]'
'}'
'},{'
'"name":"engine.workers.utilization",'
'"name":"engine.workers.usage",'
'"unit":"",'
'"description":"Engine workers utilization",'
'"description":"Engine workers usage",'
'"gauge":{'
'"dataPoints":[{'
'"asInt":0,'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ connected
write http:method "POST"
write http:version "HTTP/1.1"
write http:header "Host" "localhost:4318"
write http:header "Content-Length" "2518"
write http:header "Content-Length" "2506"
write
'{'
'"resourceMetrics":[{'
Expand Down Expand Up @@ -78,9 +78,9 @@ write
'}]'
'}'
'},{'
'"name":"engine.workers.utilization",'
'"name":"engine.workers.usage",'
'"unit":"",'
'"description":"Engine workers utilization",'
'"description":"Engine workers usage",'
'"gauge":{'
'"dataPoints":[{'
'"asInt":0,'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ connected
read http:method "POST"
read http:version "HTTP/1.1"
read http:header "Host" "localhost:4318"
read http:header "Content-Length" "2518"
read http:header "Content-Length" "2506"
read
'{'
'"resourceMetrics":[{'
Expand Down Expand Up @@ -79,9 +79,9 @@ read
'}]'
'}'
'},{'
'"name":"engine.workers.utilization",'
'"name":"engine.workers.usage",'
'"unit":"",'
'"description":"Engine workers utilization",'
'"description":"Engine workers usage",'
'"gauge":{'
'"dataPoints":[{'
'"asInt":0,'
Expand Down
Loading