Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Plumb optional labels from LB to ClientStreamTracer
As part of gRFC A78: > To support the locality label in the per-call metrics, we will provide > a mechanism for LB picker to add optional labels to the call attempt > tracer.
- Loading branch information
Showing
18 changed files
with
305 additions
and
94 deletions.
There are no files selected for viewing
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
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
59 changes: 59 additions & 0 deletions
59
api/src/testFixtures/java/io/grpc/PickSubchannelArgsMatcher.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Copyright 2024 The gRPC Authors | ||
* | ||
* Licensed 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 | ||
* | ||
* http://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 io.grpc; | ||
|
||
import com.google.common.base.Preconditions; | ||
import io.grpc.CallOptions; | ||
import io.grpc.LoadBalancer.PickSubchannelArgs; | ||
import io.grpc.Metadata; | ||
import io.grpc.MethodDescriptor; | ||
import org.mockito.ArgumentMatcher; | ||
import org.mockito.ArgumentMatchers; | ||
|
||
/** | ||
* Mockito Matcher for {@link PickSubchannelArgs}. | ||
*/ | ||
public final class PickSubchannelArgsMatcher implements ArgumentMatcher<PickSubchannelArgs> { | ||
private final MethodDescriptor<?, ?> method; | ||
private final Metadata headers; | ||
private final CallOptions callOptions; | ||
|
||
public PickSubchannelArgsMatcher( | ||
MethodDescriptor<?, ?> method, Metadata headers, CallOptions callOptions) { | ||
this.method = Preconditions.checkNotNull(method, "method"); | ||
this.headers = Preconditions.checkNotNull(headers, "headers"); | ||
this.callOptions = Preconditions.checkNotNull(callOptions, "callOptions"); | ||
} | ||
|
||
@Override | ||
public boolean matches(PickSubchannelArgs args) { | ||
return args != null | ||
&& method.equals(args.getMethodDescriptor()) | ||
&& headers.equals(args.getHeaders()) | ||
&& callOptions.equals(args.getCallOptions()); | ||
} | ||
|
||
@Override | ||
public final String toString() { | ||
return "[method=" + method + " headers=" + headers + " callOptions=" + callOptions + "]"; | ||
} | ||
|
||
public static PickSubchannelArgs eqPickSubchannelArgs( | ||
MethodDescriptor<?, ?> method, Metadata headers, CallOptions callOptions) { | ||
return ArgumentMatchers.argThat(new PickSubchannelArgsMatcher(method, headers, callOptions)); | ||
} | ||
} |
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
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
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
42 changes: 42 additions & 0 deletions
42
core/src/main/java/io/grpc/internal/PickDetailsConsumerImpl.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright 2024 The gRPC Authors | ||
* | ||
* Licensed 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 | ||
* | ||
* http://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 io.grpc.internal; | ||
|
||
import com.google.common.base.Preconditions; | ||
import io.grpc.ClientStreamTracer; | ||
import io.grpc.LoadBalancer.PickDetailsConsumer; | ||
|
||
/** | ||
* Adapter for tracers into details consumers. | ||
*/ | ||
final class PickDetailsConsumerImpl implements PickDetailsConsumer { | ||
private final ClientStreamTracer[] tracers; | ||
|
||
/** Construct a consumer with unchanging tracers array. */ | ||
public PickDetailsConsumerImpl(ClientStreamTracer[] tracers) { | ||
this.tracers = Preconditions.checkNotNull(tracers, "tracers"); | ||
} | ||
|
||
@Override | ||
public void addOptionalLabel(String key, String value) { | ||
Preconditions.checkNotNull(key, "key"); | ||
Preconditions.checkNotNull(value, "value"); | ||
for (ClientStreamTracer tracer : tracers) { | ||
tracer.addOptionalLabel(key, value); | ||
} | ||
} | ||
} |
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
Oops, something went wrong.