feat: add the missing xds.authority label #12018
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…a as in the existing flow 2. xds: modifies existing tests to account for authority
ejona86
reviewed
Apr 15, 2025
| @@ -143,7 +143,13 @@ void reportCallbackMetrics(BatchRecorder recorder, XdsClient xdsClient) { | |||
| Map<XdsResourceType<?>, Map<String, ResourceMetadata>> metadataByType = | |||
| getResourceMetadataCompleted.get(10, TimeUnit.SECONDS); | |||
|
|
|||
| computeAndReportResourceCounts(metadataByType, callback); | |||
| ListenableFuture<Map<XdsResourceType<?>, Map<String, String>>> | |||
| getResourceAuthorityCompleted = xdsClient.getSubscribedResourcesAuthoritySnapshot(); | |||
There was a problem hiding this comment.
This fixes the data race, but there's still a regular race. The two snapshots may not contain all the same types/resources. We need to either pass the authorities through an existing flow or re-compute it from the resource name.
| getResourceAuthorityCompleted = xdsClient.getSubscribedResourcesAuthoritySnapshot(); | ||
|
|
||
| Map<XdsResourceType<?>, Map<String, String>> authorityByType = | ||
| getResourceAuthorityCompleted.get(10, TimeUnit.SECONDS); |
There was a problem hiding this comment.
When using futures, you'd want to start the operations and only then wait for the completions. That way you only pay the latency cost once.
| String cacheState = cacheStateFromResourceStatus(metadata.getStatus(), metadata.isCached()); | ||
| resourceCountsByState.compute(cacheState, (k, v) -> (v == null) ? 1 : v + 1); | ||
| authorityByState.put(cacheState, authorityByType.get(type).get(resourceName)); |
There was a problem hiding this comment.
This just randomly assigns authorities to cache states. Authority is another dimension.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This aims to complete the XDS client metrics by adding the remaining grpc.xds.authority metric.