Skip to content

Commit e2689fa

Browse files
bart-at-googlecopybara-github
authored andcommitted
feat: add java-fleetengine-auth to user-agent
PiperOrigin-RevId: 504961050
1 parent 882d929 commit e2689fa

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

src/main/java/com/google/fleetengine/auth/client/FleetEngineClientSettingsModifier.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
import com.google.api.gax.core.FixedCredentialsProvider;
1818
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
1919
import com.google.api.gax.rpc.ClientSettings;
20+
import com.google.api.gax.rpc.FixedHeaderProvider;
21+
import com.google.common.base.Strings;
2022
import com.google.common.collect.Lists;
23+
import java.util.HashMap;
24+
import java.util.Map;
2125

2226
/**
2327
* Updates a fleet engine {@link ClientSettings.Builder} so that a valid Fleet Engine JWT is
@@ -56,11 +60,28 @@ public B updateBuilder(B builder) {
5660
"Transport channel provider must be of type InstantiatingGrpcChannelProvider");
5761
}
5862

63+
Map<String, String> headers = new HashMap<>();
64+
if (builder.getHeaderProvider() != null && builder.getHeaderProvider().getHeaders() != null) {
65+
headers.putAll(builder.getHeaderProvider().getHeaders());
66+
}
67+
String libraryUserAgent = "java-fleetengine-auth/";
68+
if (this.getClass().getPackage().getImplementationVersion() != null) {
69+
libraryUserAgent = libraryUserAgent + this.getClass().getPackage().getImplementationVersion();
70+
}
71+
String userAgent = headers.get("user-agent");
72+
if (Strings.isNullOrEmpty(userAgent)) {
73+
userAgent = libraryUserAgent;
74+
} else {
75+
userAgent = userAgent + " " + libraryUserAgent;
76+
}
77+
headers.put("user-agent", userAgent);
78+
5979
// Reuse existing channel provider
6080
InstantiatingGrpcChannelProvider provider =
6181
(InstantiatingGrpcChannelProvider) builder.getTransportChannelProvider();
6282
return builder
6383
.setCredentialsProvider(FixedCredentialsProvider.create(null))
84+
.setHeaderProvider(FixedHeaderProvider.create(headers))
6485
.setTransportChannelProvider(
6586
provider.toBuilder()
6687
.setInterceptorProvider(

0 commit comments

Comments
 (0)