added commit count

Author: mrehan27

.github/workflows/reusable_build_sample_apps.yml

@@ -96,6 +96,7 @@ jobs:
           echo "workspace=${{ matrix.cio-workspace-name }}" >> "samples/local.properties"
           echo "branchName=$BRANCH_NAME" >> "samples/local.properties"
           echo "commitHash=${COMMIT_HASH:0:7}" >> "samples/local.properties"
+          echo "commitsAheadCount=$(git rev-list $(git describe --tags --abbrev=0)..${{ env.BRANCH_NAME }} --count)" >> samples/local.properties
           if [ "${{ inputs.use_latest_sdk_version == true }}" ]; then
             echo "sdkVersion=${{ steps.latest-sdk-version-step.outputs.LATEST_TAG }}" >> "samples/local.properties"
           fi

samples/java_layout/src/main/java/io/customer/android/sample/java_layout/buildinfo/BuildInfoMetadata.java

@@ -27,8 +27,10 @@ public class BuildInfoMetadata {
     private final String sdkIntegration;
 
     public BuildInfoMetadata() {
-        this.sdkVersion = BuildInfoMetadataUtils.resolveValidOrElse(BuildConfig.SDK_VERSION, () -> Version.version + " (as source)");
-        this.appVersion = BuildConfig.VERSION_NAME;
+        this.sdkVersion = String.format(Locale.ENGLISH, "%s-%s",
+                BuildInfoMetadataUtils.resolveValidOrElse(BuildConfig.SDK_VERSION, () -> Version.version),
+                BuildInfoMetadataUtils.resolveValidOrElse(BuildConfig.COMMITS_AHEAD_COUNT, () -> "as-source"));
+        this.appVersion = String.valueOf(BuildConfig.VERSION_CODE);
         this.buildDate = BuildInfoMetadataUtils.formatBuildDateWithRelativeTime(BuildConfig.BUILD_TIMESTAMP);
         this.gitMetadata = String.format(Locale.ENGLISH, "%s-%s",
                 BuildInfoMetadataUtils.resolveValidOrElse(BuildConfig.BRANCH_NAME, () -> "working branch"),

samples/sample-app.gradle

@@ -46,6 +46,7 @@ android {
         String sdkVersion = localProperties["sdkVersion"]
         String branchName = localProperties["branchName"]
         String commitHash = localProperties["commitHash"]
+        String commitsAheadCount = localProperties["commitsAheadCount"]
 
         // Set build config fields for API keys
         buildConfigField "String", "CDP_API_KEY", "\"${cdpApiKey}\""
@@ -57,6 +58,7 @@ android {
         buildConfigField "String", "SDK_VERSION", "\"${sdkVersion}\""
         buildConfigField "String", "BRANCH_NAME", "\"${branchName}\""
         buildConfigField "String", "COMMIT_HASH", "\"${commitHash}\""
+        buildConfigField "String", "COMMITS_AHEAD_COUNT", "\"${commitsAheadCount}\""
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
     // Avoid redefining signing configs in sample apps to avoid breaking release