Generate client-version from git tag (#48)

Generate client-version from git tag

Author: mfateev

build.gradle

@@ -10,6 +10,7 @@ plugins {
     id 'java-library'
     id 'net.ltgt.errorprone' version '1.1.1'
     id 'net.minecrell.licenser' version '0.4.1'
+    id 'com.palantir.git-version' version '0.12.3'
 }
 
 repositories {
@@ -39,8 +40,38 @@ googleJavaFormat {
     exclude '**/.idea/**'
 }
 
-group = 'io.temporal'
-version = '0.10.0-SNAPSHOT'
+// v0.20.0-2-g000a42a -> 0.20.0-2-g000a42a
+ext.getTag = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim().substring(1)
+}
+
+// 0.20.0-2-g000a42a -> 0.20.0-SNAPSHOT
+// 0.20.0 -> 0.20.0
+// Used to name jar files
+ext.getVersionName = { ->
+    def split = getTag().split('-')
+    if (split.size() > 1) {
+        return split[0] + '-SNAPSHOT'
+    }
+    return split[0]
+}
+
+// 0.20.0-SNAPSHOT -> 0.20.0
+// 0.20.0 -> 0.20.0
+// Stored int version.properties which is loaded
+// and used as a value of temporal-client-version gRPC header.
+ext.getClientVersionName = { ->
+    def split = getVersionName().split('-')
+    return split[0]
+}
+
+group='io.temporal'
+version = getVersionName()
 archivesBaseName="temporal-sdk"
 
 description = '''Temporal Workflow Java SDK'''
@@ -138,13 +169,13 @@ compileTestJava {
 // Generation version.properties for value to be included into the request header
 task createProperties(dependsOn: processResources) {
     doLast {
-        def subdir = new File('$buildDir/resources/main/io/temporal/')
+        def subdir = new File("$buildDir/resources/main/io/temporal/")
         if (!subdir.exists()) {
             subdir.mkdirs()
         }
-        new File('$buildDir/resources/main/io/temporal/version.properties').withWriter { w ->
+        new File("$buildDir/resources/main/io/temporal/version.properties").withWriter { w ->
             Properties p = new Properties()
-            p['temporal-client-version'] = project.version.toString()
+            p['temporal-client-version'] = getClientVersionName()
             p.store w, null
         }
     }

src/main/java/io/temporal/internal/Version.java

@@ -34,7 +34,7 @@ public class Version {
 
   /**
    * Library Version is a semver that represents the version of this Temporal client library. This
-   * represent API changes visibile to Temporal client side library consumers. I.e. developers that
+   * represent API changes visible to Temporal client side library consumers. I.e. developers that
    * are writing workflows. So every time we change API that can affect them we have to change this
    * number. Format: MAJOR.MINOR.PATCH
    */
@@ -50,7 +50,7 @@ public class Version {
   static {
     // Load version from version.properties generated by Gradle into build/resources/main directory.
     Properties prop = new Properties();
-    InputStream in = Version.class.getResourceAsStream("/io.temporal/version.properties");
+    InputStream in = Version.class.getResourceAsStream("/io/temporal/version.properties");
     if (in == null) {
       LIBRARY_VERSION = "UNKNOWN";
     } else {

src/main/java/io/temporal/internal/WorkflowServiceStubsImpl.java

@@ -51,15 +51,15 @@ public final class WorkflowServiceStubsImpl implements WorkflowServiceStubs {
 
   /** refers to the name of the gRPC header that contains the client library version */
   private static final Metadata.Key<String> LIBRARY_VERSION_HEADER_KEY =
-      Metadata.Key.of("temporal-sdk-version", Metadata.ASCII_STRING_MARSHALLER);
+      Metadata.Key.of("temporal-client-version", Metadata.ASCII_STRING_MARSHALLER);
 
   /** refers to the name of the gRPC header that contains the client feature version */
   private static final Metadata.Key<String> FEATURE_VERSION_HEADER_KEY =
-      Metadata.Key.of("temporal-sdk-feature-version", Metadata.ASCII_STRING_MARSHALLER);
+      Metadata.Key.of("temporal-client-feature-version", Metadata.ASCII_STRING_MARSHALLER);
 
   /** refers to the name of the gRPC header that contains the client SDK name */
   private static final Metadata.Key<String> CLIENT_IMPL_HEADER_KEY =
-      Metadata.Key.of("temporal-sdk-name", Metadata.ASCII_STRING_MARSHALLER);
+      Metadata.Key.of("temporal-client-name", Metadata.ASCII_STRING_MARSHALLER);
 
   private static final String CLIENT_IMPL_HEADER_VALUE = "temporal-java";