Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
import com.google.common.collect.ImmutableList;

import com.linecorp.armeria.common.annotation.Nullable;
import com.linecorp.armeria.common.metric.MeterIdPrefix;
import com.linecorp.armeria.xds.client.endpoint.XdsLoadBalancer;

import io.envoyproxy.envoy.config.bootstrap.v3.Bootstrap;
import io.envoyproxy.envoy.config.cluster.v3.Cluster;
import io.micrometer.core.instrument.MeterRegistry;
import io.netty.util.concurrent.EventExecutor;

final class BootstrapClusters implements SnapshotWatcher<ClusterSnapshot> {
Expand All @@ -39,16 +41,19 @@ final class BootstrapClusters implements SnapshotWatcher<ClusterSnapshot> {
private final List<SnapshotWatcher<? super ClusterSnapshot>> watchers;

BootstrapClusters(Bootstrap bootstrap, EventExecutor eventLoop, XdsClusterManager clusterManager,
SnapshotWatcher<Object> defaultSnapshotWatcher) {
SnapshotWatcher<Object> defaultSnapshotWatcher,
MeterIdPrefix meterIdPrefix, MeterRegistry meterRegistry) {
this.bootstrap = bootstrap;
this.eventLoop = eventLoop;
this.clusterManager = clusterManager;
watchers = ImmutableList.of(defaultSnapshotWatcher, this);
initializePrimary(bootstrap);
initializePrimary(bootstrap, meterIdPrefix, meterRegistry);
}

private void initializePrimary(Bootstrap bootstrap) {
final StaticSubscriptionContext context = new StaticSubscriptionContext(eventLoop);
private void initializePrimary(Bootstrap bootstrap, MeterIdPrefix meterIdPrefix,
MeterRegistry meterRegistry) {
final StaticSubscriptionContext context =
new StaticSubscriptionContext(eventLoop, meterIdPrefix, meterRegistry);
for (Cluster cluster: bootstrap.getStaticResources().getClustersList()) {
if (!cluster.hasLoadAssignment()) {
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package com.linecorp.armeria.xds;

import com.linecorp.armeria.common.metric.MeterIdPrefix;

import io.micrometer.core.instrument.MeterRegistry;
import io.netty.util.concurrent.EventExecutor;

final class DefaultSubscriptionContext implements SubscriptionContext {
Expand All @@ -24,21 +27,36 @@ final class DefaultSubscriptionContext implements SubscriptionContext {
private final XdsClusterManager clusterManager;
private final ConfigSourceMapper configSourceMapper;
private final ControlPlaneClientManager controlPlaneClientManager;
private final MeterRegistry meterRegistry;
private final MeterIdPrefix meterIdPrefix;

DefaultSubscriptionContext(EventExecutor eventLoop, XdsClusterManager clusterManager,
ConfigSourceMapper configSourceMapper,
ControlPlaneClientManager controlPlaneClientManager) {
ControlPlaneClientManager controlPlaneClientManager,
MeterRegistry meterRegistry, MeterIdPrefix meterIdPrefix) {
this.eventLoop = eventLoop;
this.clusterManager = clusterManager;
this.configSourceMapper = configSourceMapper;
this.controlPlaneClientManager = controlPlaneClientManager;
this.meterRegistry = meterRegistry;
this.meterIdPrefix = meterIdPrefix;
}

@Override
public EventExecutor eventLoop() {
return eventLoop;
}

@Override
public MeterRegistry meterRegistry() {
return meterRegistry;
}

@Override
public MeterIdPrefix meterIdPrefix() {
return meterIdPrefix;
}

@Override
public void subscribe(ResourceNode<?> node) {
controlPlaneClientManager.subscribe(node);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,309 @@
/*
* Copyright 2025 LY Corporation
*
* LY Corporation licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/

package com.linecorp.armeria.xds;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

import com.linecorp.armeria.client.Endpoint;
import com.linecorp.armeria.client.endpoint.EndpointGroup;
import com.linecorp.armeria.common.metric.MeterIdPrefix;
import com.linecorp.armeria.common.util.SafeCloseable;
import com.linecorp.armeria.xds.client.endpoint.HostSet;
import com.linecorp.armeria.xds.client.endpoint.LoadBalancerState;
import com.linecorp.armeria.xds.client.endpoint.XdsLoadBalancerLifecycleObserver;

import io.envoyproxy.envoy.config.core.v3.Locality;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;

final class DefaultXdsLoadBalancerLifecycleObserver implements XdsLoadBalancerLifecycleObserver {

private final SnapshotUpdateRecorder resourceUpdatedRecorder;
private final SnapshotUpdateRecorder endpointsUpdatedRecorder;
private final SnapshotUpdateRecorder stateUpdatedRecorder;
private final SnapshotUpdateRecorder stateRejectedRecorder;
private final LoadBalancerRecorder loadBalancerRecorder;

DefaultXdsLoadBalancerLifecycleObserver(MeterIdPrefix prefix,
MeterRegistry meterRegistry, String clusterName) {
prefix = prefix.withTags("cluster", clusterName);
resourceUpdatedRecorder =
new SnapshotUpdateRecorder(meterRegistry, prefix.append("lb.resource.updated"));
endpointsUpdatedRecorder =
new SnapshotUpdateRecorder(meterRegistry, prefix.append("lb.endpoints.updated"));
stateUpdatedRecorder =
new SnapshotUpdateRecorder(meterRegistry, prefix.append("lb.state.updated"));
stateRejectedRecorder =
new SnapshotUpdateRecorder(meterRegistry, prefix.append("lb.state.rejected"));
loadBalancerRecorder = new LoadBalancerRecorder(meterRegistry, prefix);
}

@Override
public void resourceUpdated(ClusterSnapshot snapshot) {
resourceUpdatedRecorder.snapshotUpdated(snapshot);
}

@Override
public void endpointsUpdated(ClusterSnapshot snapshot, List<Endpoint> endpoints) {
endpointsUpdatedRecorder.snapshotUpdated(snapshot);
}

@Override
public void stateUpdated(ClusterSnapshot snapshot, LoadBalancerState state) {
stateUpdatedRecorder.snapshotUpdated(snapshot);
loadBalancerRecorder.stateUpdated(state);
}

@Override
public void stateRejected(ClusterSnapshot snapshot, List<Endpoint> endpoints, Throwable cause) {
stateRejectedRecorder.snapshotUpdated(snapshot);
}

@Override
public void close() {
resourceUpdatedRecorder.close();
endpointsUpdatedRecorder.close();
stateUpdatedRecorder.close();
stateRejectedRecorder.close();
loadBalancerRecorder.close();
}

private static class LoadBalancerRecorder implements SafeCloseable {

private Map<Integer, PriorityRecorder> priorityMap = new HashMap<>();
private final MeterRegistry meterRegistry;
private final MeterIdPrefix prefix;
private final List<Meter> meters;

private int numSubsets;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be volatile or AtomicInteger?


LoadBalancerRecorder(MeterRegistry meterRegistry, MeterIdPrefix prefix) {
this.meterRegistry = meterRegistry;
this.prefix = prefix;

final ImmutableList.Builder<Meter> metersBuilder = ImmutableList.builder();
metersBuilder.add(Gauge.builder(prefix.name("lb.state.subsets"), () -> numSubsets)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Collection seems unnecessary.

.tags(prefix.tags())
.description("the number of subsets")
.register(meterRegistry));
meters = metersBuilder.build();
}

void stateUpdated(LoadBalancerState state) {

numSubsets = state.subsetStates().size();

final Map<Integer, PriorityRecorder> prevPriorityMap = priorityMap;
final Map<Integer, PriorityRecorder> priorityMap = new HashMap<>();

// handle new HostSets
for (Entry<Integer, HostSet> e: state.hostSets().entrySet()) {
final int priority = e.getKey();
PriorityRecorder recorder = prevPriorityMap.get(e.getKey());
if (recorder == null) {
recorder = new PriorityRecorder(meterRegistry, prefix, priority);
}
recorder.update(priority, e.getValue(), state);
priorityMap.put(priority, recorder);
}

// nullify missing priorities
for (Entry<Integer, PriorityRecorder> e: prevPriorityMap.entrySet()) {
if (!priorityMap.containsKey(e.getKey())) {
e.getValue().close();
}
}
this.priorityMap = ImmutableMap.copyOf(priorityMap);
}

@Override
public void close() {
meters.forEach(meterRegistry::remove);
priorityMap.values().forEach(PriorityRecorder::close);
}
}

private static class PriorityRecorder implements SafeCloseable {

private Map<Locality, LocalityRecorder> localityMap = ImmutableMap.of();
private final MeterRegistry meterRegistry;
private final MeterIdPrefix prefix;
private final int priority;
private final List<Meter> meters;

private int healthyLoad;
private int degradedLoad;
private boolean panicState;
private double zarLocalPercentage;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto


PriorityRecorder(MeterRegistry meterRegistry, MeterIdPrefix prefix, int priority) {
this.meterRegistry = meterRegistry;
this.priority = priority;
prefix = prefix.withTags("priority", Integer.toString(priority));
this.prefix = prefix;

final ImmutableList.Builder<Meter> metersBuilder = ImmutableList.builder();
metersBuilder.add(Gauge.builder(prefix.name("lb.state.load.healthy"), () -> healthyLoad)
.tags(prefix.tags())
.register(meterRegistry));
metersBuilder.add(Gauge.builder(prefix.name("lb.state.load.degraded"), () -> degradedLoad)
.tags(prefix.tags())
.register(meterRegistry));
metersBuilder.add(Gauge.builder(prefix.name("lb.state.panic"), () -> panicState ? 1 : 0)
.tags(prefix.tags())
.description("1: panic, 0: normal")
.register(meterRegistry));
if (priority == 0) {
metersBuilder.add(Gauge.builder(prefix.name("lb.zar.local.percentage"),
() -> zarLocalPercentage)
.tags(prefix.tags())
.register(meterRegistry));
}
meters = metersBuilder.build();
}

void update(int priority, HostSet hostSet, LoadBalancerState state) {
assert this.priority == priority;

healthyLoad = state.healthyPriorityLoad().getOrDefault(priority, 0);
degradedLoad = state.degradedPriorityLoad().getOrDefault(priority, 0);
panicState = state.perPriorityPanic().getOrDefault(priority, false);
zarLocalPercentage = state.zarLocalPercentage();

// update locality-specific metrics
final Map<Locality, LocalityRecorder> prevLocalityMap = localityMap;
final Map<Locality, LocalityRecorder> localityMap = new HashMap<>();
for (Locality locality: hostSet.endpointGroupPerLocality().keySet()) {
LocalityRecorder recorder = prevLocalityMap.get(locality);
if (recorder == null) {
recorder = new LocalityRecorder(meterRegistry, prefix, locality, priority);
}
recorder.update(hostSet, state.zarResidualPercentages().getOrDefault(locality, 0d));
localityMap.put(locality, recorder);
}
for (Entry<Locality, LocalityRecorder> e: prevLocalityMap.entrySet()) {
if (!localityMap.containsKey(e.getKey())) {
e.getValue().close();
}
}
this.localityMap = ImmutableMap.copyOf(localityMap);
}

@Override
public void close() {
meters.forEach(meterRegistry::remove);
localityMap.values().forEach(LocalityRecorder::close);
}
}

private static class LocalityRecorder implements SafeCloseable {

private final MeterRegistry meterRegistry;
private final Locality locality;
private final List<Meter> meters;

private int total;
private int healthy;
private int degraded;
private int localityWeight;
private double zarPercentage;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto


LocalityRecorder(MeterRegistry meterRegistry, MeterIdPrefix prefix, Locality locality,
int priority) {
this.meterRegistry = meterRegistry;
this.locality = locality;
prefix = prefix.withTags("region", locality.getRegion(),
"zone", locality.getZone(),
"sub_zone", locality.getSubZone());
final ImmutableList.Builder<Meter> metersBuilder = ImmutableList.builder();
metersBuilder.add(Gauge.builder(prefix.name("lb.membership.total"), () -> total)
.tags(prefix.tags())
.register(meterRegistry));
metersBuilder.add(Gauge.builder(prefix.name("lb.membership.healthy"), () -> healthy)
.tags(prefix.tags())
.register(meterRegistry));
metersBuilder.add(Gauge.builder(prefix.name("lb.membership.degraded"), () -> degraded)
.tags(prefix.tags())
.register(meterRegistry));
metersBuilder.add(Gauge.builder(prefix.name("lb.locality.weight"), () -> localityWeight)
.tags(prefix.tags())
.register(meterRegistry));
if (priority == 0) {
metersBuilder.add(Gauge.builder(prefix.name("lb.zar.residual.percentage"), () -> zarPercentage)
.tags(prefix.tags())
.register(meterRegistry));
}
meters = metersBuilder.build();
}

void update(HostSet hostSet, double zarPercentage) {
final EndpointGroup allHosts = hostSet.endpointGroupPerLocality()
.getOrDefault(locality, EndpointGroup.of());
total = allHosts.endpoints().size();
final EndpointGroup healthyHosts = hostSet.healthyEndpointGroupPerLocality()
.getOrDefault(locality, EndpointGroup.of());
healthy = healthyHosts.endpoints().size();
final EndpointGroup degradedHosts = hostSet.degradedEndpointGroupPerLocality()
.getOrDefault(locality, EndpointGroup.of());
degraded = degradedHosts.endpoints().size();
localityWeight = hostSet.localityWeights().getOrDefault(locality, 0);
this.zarPercentage = zarPercentage;
}

@Override
public void close() {
meters.forEach(meterRegistry::remove);
}
}

private static class SnapshotUpdateRecorder implements SafeCloseable {

private final MeterRegistry meterRegistry;
private long revision;
private final Gauge revisionGauge;
private final Counter updatedCounter;

SnapshotUpdateRecorder(MeterRegistry meterRegistry, MeterIdPrefix prefix) {
this.meterRegistry = meterRegistry;
revisionGauge = Gauge.builder(prefix.name("revision"), () -> revision)
.tags(prefix.tags())
.register(meterRegistry);
updatedCounter = Counter.builder(prefix.name("count"))
.tags(prefix.tags())
.register(meterRegistry);
}

void snapshotUpdated(ClusterSnapshot snapshot) {
revision = snapshot.xdsResource().revision();
updatedCounter.increment();
}

@Override
public void close() {
meterRegistry.remove(revisionGauge);
meterRegistry.remove(updatedCounter);
}
}
}
Loading
Loading