Skip to content

Commit 9e65ea8

Browse files
committed
FIT performers: add hardcoded fallback for introspected version failure
Change-Id: Ie762c10747c1b251ee1bcd59b97d67b6c2773d8e Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/202090 Tested-by: Graham Pople <[email protected]> Reviewed-by: Graham Pople <[email protected]> Tested-by: Build Bot <[email protected]>
1 parent 663bfda commit 9e65ea8

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

java-fit-performer/src/main/java/com/couchbase/PerformerService.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,13 @@ protected TransactionCommandExecutor transactionsExecutor(com.couchbase.client.p
128128
@Override
129129
protected void customisePerformerCaps(PerformerCapsFetchResponse.Builder response) {
130130
response.addAllSdkImplementationCaps(Capabilities.sdkImplementationCaps());
131-
response.setLibraryVersion(VersionUtil.introspectSDKVersionJava());
131+
var sdkVersion = VersionUtil.introspectSDKVersionJava();
132+
if (sdkVersion == null) {
133+
// Not entirely clear why this fails sometimes on CI, return something sort of sensible as a default.
134+
sdkVersion = "3.5.0";
135+
logger.warn("Unable to introspect the sdk version, forcing it to {}", sdkVersion);
136+
}
137+
response.setLibraryVersion(sdkVersion);
132138

133139
// [start:3.3.0]
134140
for (Extension ext : Extension.SUPPORTED) {

scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ScalaPerformer.scala

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,16 @@ class ScalaPerformer extends CorePerformer {
9494
val supported = new Supported
9595
val protocolVersion = supported.protocolMajor + "." + supported.protocolMinor
9696
response.setTransactionsProtocolVersion("2.0")
97-
response.setLibraryVersion(VersionUtil.introspectSDKVersionScala)
97+
val sdkVersionRaw = VersionUtil.introspectSDKVersionScala
98+
val sdkVersion = if (sdkVersionRaw == null) {
99+
// Not entirely clear why this fails sometimes on CI, return something sort of sensible as a default.
100+
logger.warn("Unable to introspect the sdk version, forcing it to 1.5.0")
101+
"1.5.0"
102+
}
103+
else {
104+
sdkVersionRaw
105+
}
106+
response.setLibraryVersion(sdkVersion)
98107

99108
Extension.SUPPORTED.asScala
100109
.filterNot(v =>

0 commit comments

Comments
 (0)