xds: Add counter and gauge metrics #11661
Conversation
| ref = new RefCountedXdsClientObjectPool(bootstrapInfo, target); | ||
| MetricRecorder metricRecorderForTarget = targetToMetricRecorderMap.get(target); | ||
| metricRecorder = | ||
| metricRecorderForTarget != null ? metricRecorderForTarget : metricRecorder; |
There was a problem hiding this comment.
Don't store the metric recorder. Always use metricRecorder here; if we used to use a different value, that's fine. We actually can't store the MetricRecorders in targetToMetricRecorderMap as that would retain memory of old channels even when all channels for a target have been shut down. We need the MetricRecorder to be released in that case.
There was a problem hiding this comment.
Removed targetToMetricRecorderMap and found similar issue of retaining memory in targetToXdsClientMap. Removed the entry for corresponding target key from targetToXdsClientMap when there are no channels for target.
| @@ -38,16 +38,19 @@ | |||
| import io.grpc.SynchronizationContext.ScheduledHandle; | |||
| import io.grpc.internal.BackoffPolicy; | |||
| import io.grpc.internal.TimeProvider; | |||
| import io.grpc.xds.XdsClientMetricReporter; | |||
There was a problem hiding this comment.
XdsClientImpl can't depend on io.grpc.xds. It needs to be usable stand-alone. The Reporter should be defined in io.grpc.xds.client.
There was a problem hiding this comment.
Moved to io.grpc.xds.client.
| @@ -31,5 +32,8 @@ interface XdsClientPoolFactory { | |||
|
|
|||
| ObjectPool<XdsClient> getOrCreate(String target) throws XdsInitializationException; | |||
There was a problem hiding this comment.
Can you easily delete the old method? (I see the Internal* class that exposes the same signature; that's fine as it is used some other places. But the method here should only be used in our code and I'd hope there are only a few callers.)
There was a problem hiding this comment.
Deleted the old method.
| @@ -118,13 +125,15 @@ public XdsClientImpl( | |||
| this.timeProvider = timeProvider; | |||
| this.messagePrinter = messagePrinter; | |||
| this.securityConfig = securityConfig; | |||
| this.target = target; | |||
| this.metricReporter = metricReporter; | |||
| metricReporter.setXdsClient(this); | |||
There was a problem hiding this comment.
We should move this and close() out of XdsClientImpl and into SharedXdsClientPoolProvider. The caller is in control of the XdsClientImpl lifecycle, so it doesn't have to have XdsClientImpl tell it when things happen.
| * Interface for reporting metrics through callback. | ||
| * | ||
| */ | ||
| interface CallbackMetricReporter { |
There was a problem hiding this comment.
Since these methods are tightly coupled to methods in XdsClient, I suggest having one interface for each of the methods and defining the method in XdsClient. You also then wouldn't have default implementation. That is more clear, and in our modern Java lambda world is more typical.
This PR implements xDS client defined in A78.
Counters
Gauges
The
grpc.xds.authoritylabel is missing, and will be added in a later PR.