Skip to content

[cherry-pick] Support passing request-id and unixmsec to server (#1573) #1601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sre-ci-robot merged 1 commit into from
Sep 16, 2025
Merged

[cherry-pick] Support passing request-id and unixmsec to server (#1573) #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions sdk-core/src/main/java/io/milvus/v2/client/ConnectConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ public class ConnectConfig {
private long idleTimeoutMs = TimeUnit.MILLISECONDS.convert(24, TimeUnit.HOURS);

private SSLContext sslContext;
// clientRequestId maintains a map for different threads, each thread can assign a specific id.
// the specific id is passed to the server, from the access log we can know which client calls the interface
private ThreadLocal<String> clientRequestId;

public String getHost() {
io.milvus.utils.URLParser urlParser = new io.milvus.utils.URLParser(this.uri);
Expand Down
42 changes: 31 additions & 11 deletions sdk-core/src/main/java/io/milvus/v2/utils/ClientUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

package io.milvus.v2.utils;

import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.grpc.Metadata;
import io.grpc.*;
import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
import io.grpc.netty.shaded.io.netty.handler.ssl.ApplicationProtocolConfig;
Expand All @@ -33,11 +31,7 @@
import io.milvus.client.MilvusServiceClient;
import io.milvus.grpc.*;
import io.milvus.v2.client.ConnectConfig;
import io.grpc.HttpConnectProxiedSocketAddress;
import io.grpc.ProxiedSocketAddress;
import io.grpc.ProxyDetector;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -47,7 +41,9 @@
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
Expand All @@ -66,6 +62,30 @@ public ManagedChannel getChannel(ConnectConfig connectConfig){
metadata.put(Metadata.Key.of("dbname", Metadata.ASCII_STRING_MARSHALLER), connectConfig.getDbName());
}

List<ClientInterceptor> clientInterceptors = new ArrayList<>();
clientInterceptors.add(MetadataUtils.newAttachHeadersInterceptor(metadata));
//client interceptor used to fetch client_request_id from threadlocal variable and set it for every grpc request
clientInterceptors.add(new ClientInterceptor() {
@Override
public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
return new ForwardingClientCall
.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
@Override
public void start(ClientCall.Listener<RespT> responseListener, Metadata headers) {
String currentMs = String.valueOf(System.currentTimeMillis());
headers.put(Metadata.Key.of("client-request-unixmsec", Metadata.ASCII_STRING_MARSHALLER), currentMs);
if(connectConfig.getClientRequestId() != null) {
String clientID = connectConfig.getClientRequestId().get();
if (!StringUtils.isEmpty(clientID)) {
headers.put(Metadata.Key.of("client_request_id", Metadata.ASCII_STRING_MARSHALLER), clientID);
}
}
super.start(responseListener, headers);
}
};
}
});

try {
if (connectConfig.getSslContext() != null) {
// sslContext from connect config
Expand All @@ -77,7 +97,7 @@ public ManagedChannel getChannel(ConnectConfig connectConfig){
.keepAliveTimeout(connectConfig.getKeepAliveTimeoutMs(), TimeUnit.MILLISECONDS)
.keepAliveWithoutCalls(connectConfig.isKeepAliveWithoutCalls())
.idleTimeout(connectConfig.getIdleTimeoutMs(), TimeUnit.MILLISECONDS)
.intercept(MetadataUtils.newAttachHeadersInterceptor(metadata));
.intercept(clientInterceptors);

if (StringUtils.isNotEmpty(connectConfig.getProxyAddress())) {
configureProxy(builder, connectConfig.getProxyAddress());
Expand All @@ -104,7 +124,7 @@ public ManagedChannel getChannel(ConnectConfig connectConfig){
.keepAliveTimeout(connectConfig.getKeepAliveTimeoutMs(), TimeUnit.MILLISECONDS)
.keepAliveWithoutCalls(connectConfig.isKeepAliveWithoutCalls())
.idleTimeout(connectConfig.getIdleTimeoutMs(), TimeUnit.MILLISECONDS)
.intercept(MetadataUtils.newAttachHeadersInterceptor(metadata));
.intercept(clientInterceptors);

if (StringUtils.isNotEmpty(connectConfig.getProxyAddress())) {
configureProxy(builder, connectConfig.getProxyAddress());
Expand All @@ -130,7 +150,7 @@ public ManagedChannel getChannel(ConnectConfig connectConfig){
.keepAliveTimeout(connectConfig.getKeepAliveTimeoutMs(), TimeUnit.MILLISECONDS)
.keepAliveWithoutCalls(connectConfig.isKeepAliveWithoutCalls())
.idleTimeout(connectConfig.getIdleTimeoutMs(), TimeUnit.MILLISECONDS)
.intercept(MetadataUtils.newAttachHeadersInterceptor(metadata));
.intercept(clientInterceptors);

if (StringUtils.isNotEmpty(connectConfig.getProxyAddress())) {
configureProxy(builder, connectConfig.getProxyAddress());
Expand All @@ -152,7 +172,7 @@ public ManagedChannel getChannel(ConnectConfig connectConfig){
.keepAliveTimeout(connectConfig.getKeepAliveTimeoutMs(), TimeUnit.MILLISECONDS)
.keepAliveWithoutCalls(connectConfig.isKeepAliveWithoutCalls())
.idleTimeout(connectConfig.getIdleTimeoutMs(), TimeUnit.MILLISECONDS)
.intercept(MetadataUtils.newAttachHeadersInterceptor(metadata));
.intercept(clientInterceptors);
if (StringUtils.isNotEmpty(connectConfig.getProxyAddress())) {
configureProxy(builder, connectConfig.getProxyAddress());
}
Expand Down
Loading