feat: [DEL-4338]: Change versioning of immutable delegate (#35396)

* [DEL-4337]: separate version for immutable delegates

* [DEL-4338]: Separate build.prop for 260-delegate

* [DEL-4338]: metrics addition

Author: AnupamIO

260-delegate/build.properties

@@ -0,0 +1,4 @@
+build.majorVersion=22
+build.minorVersion=7
+build.number=76100
+build.patch=000

260-delegate/src/main/java/io/harness/delegate/service/DelegateAgentServiceImpl.java

@@ -594,6 +594,7 @@ private void initDelegateProcess(final boolean watched) {
               .sampleDelegate(isSample)
               .location(Paths.get("").toAbsolutePath().toString())
               .heartbeatAsObject(true)
+              .immutable(isImmutableDelegate)
               .ceEnabled(Boolean.parseBoolean(System.getenv("ENABLE_CE")));
 
       delegateId = registerDelegate(builder);

400-rest/src/main/java/software/wings/service/impl/DelegateServiceImpl.java

@@ -36,6 +36,8 @@
 import static io.harness.metrics.impl.DelegateMetricsServiceImpl.DELEGATE_DISCONNECTED;
 import static io.harness.metrics.impl.DelegateMetricsServiceImpl.DELEGATE_REGISTRATION_FAILED;
 import static io.harness.metrics.impl.DelegateMetricsServiceImpl.DELEGATE_RESTARTED;
+import static io.harness.metrics.impl.DelegateMetricsServiceImpl.IMMUTABLE_DELEGATES;
+import static io.harness.metrics.impl.DelegateMetricsServiceImpl.MUTABLE_DELEGATES;
 import static io.harness.mongo.MongoUtils.setUnset;
 import static io.harness.obfuscate.Obfuscator.obfuscate;
 import static io.harness.persistence.HQuery.excludeAuthority;
@@ -2591,6 +2593,10 @@ public DelegateRegisterResponse register(final DelegateParams delegateParams) {
 
     log.info("Registering delegate for Hostname: {} IP: {}", delegateParams.getHostName(), delegateParams.getIp());
 
+    // publish delegateType metrics at account level.
+    String delegateTypeMetric = delegateParams.isImmutable() ? IMMUTABLE_DELEGATES : MUTABLE_DELEGATES;
+    delegateMetricsService.recordDelegateMetricsPerAccount(delegateParams.getAccountId(), delegateTypeMetric);
+
     String delegateGroupId = delegateParams.getDelegateGroupId();
     if (isBlank(delegateGroupId) && isNotBlank(delegateParams.getDelegateGroupName())) {
       final DelegateGroup delegateGroup =
@@ -2674,6 +2680,7 @@ public DelegateRegisterResponse register(final DelegateParams delegateParams) {
                                   .ceEnabled(delegateParams.isCeEnabled())
                                   .delegateTokenName(delegateTokenName.orElse(null))
                                   .heartbeatAsObject(delegateParams.isHeartbeatAsObject())
+                                  .immutable(delegateParams.isImmutable())
                                   .build();
 
     if (ECS.equals(delegateParams.getDelegateType())) {

400-rest/src/main/resources/metrics/metricDefinitions/delegate_metrics.yaml

@@ -22,4 +22,12 @@ metrics:
     metricDefinition: Delegate self destruct
     type: Count
     unit: "1"
+  - metricName: immutable_delegates
+    metricDefinition: Immutable delegate count
+    type: Count
+    unit: "1"
+  - metricName: mutable_delegates
+    metricDefinition: Mutable delegate count
+    type: Count
+    unit: "1"
 

420-delegate-service/src/main/java/io/harness/delegate/beans/Delegate.java

@@ -126,6 +126,8 @@ public static List<MongoIndex> mongoIndexes() {
 
   private boolean heartbeatAsObject;
 
+  private boolean immutable;
+
   @Override
   public void updateNextIteration(String fieldName, long nextIteration) {
     if (DelegateKeys.taskExpiryCheckNextIteration.equals(fieldName)) {

420-delegate-service/src/main/java/io/harness/metrics/impl/DelegateMetricsServiceImpl.java

@@ -58,6 +58,10 @@ public class DelegateMetricsServiceImpl implements DelegateMetricsService {
   public static final String SECRETS_CACHE_LOOKUPS = "delegate_secret_cache_lookups";
   public static final String SECRETS_CACHE_INSERTS = "delegate_secret_cache_inserts";
 
+  public static final String IMMUTABLE_DELEGATES = "immutable_delegates";
+
+  public static final String MUTABLE_DELEGATES = "mutable_delegates";
+
   @Inject private MetricService metricService;
   @Inject private DelegateTaskMetricContextBuilder metricContextBuilder;
 

920-delegate-agent-beans/src/main/java/io/harness/delegate/beans/DelegateParams.java

@@ -50,6 +50,7 @@ public class DelegateParams {
   boolean proxy;
   boolean ceEnabled;
   boolean heartbeatAsObject;
+  boolean immutable;
 
   List<String> supportedTaskTypes;
 

scripts/jenkins/release-branch.sh

@@ -146,6 +146,34 @@ git commit -m "Branching to release/${PURPOSE}/${VERSION}xx. New version ${NEW_V
 git push origin develop
 print_err "$?" "Pushing build.properties to develop branch failed"
 
+# Bumping version in delegate's build.properties in develop branch.
+# TODO: This will be separated to different release-branch.sh in 260-delegate when we separate release branch for delegate.
+echo "STEP3: INFO: Bumping version in delegate's build.properties in develop branch."
+git fetch origin refs/heads/develop; git checkout develop && git branch
+check_branch_name "develop"
+
+export DELEGATE_VERSION_FILE=260-delegate/build.properties
+
+export VERSION=`cat ${DELEGATE_VERSION_FILE} | grep 'build.number=' | sed -e 's: *build.number=::g'`
+export MAJOR_VERSION=`cat ${DELEGATE_VERSION_FILE} | grep 'build.majorVersion=' | sed -e 's: *build.majorVersion=::g'`
+export MINOR_VERSION=`cat ${DELEGATE_VERSION_FILE} | grep 'build.minorVersion=' | sed -e 's: *build.minorVersion=::g'`
+
+YEAR=$(date +%y)
+MONTH=$(date +%m)
+
+export VERSION=${VERSION%??}
+export NEW_VERSION=$(( ${VERSION}+1 ))
+
+sed -i "s:build.number=${VERSION}00:build.number=${NEW_VERSION}00:g" ${DELEGATE_VERSION_FILE}
+sed -i "s:build.majorVersion=${MAJOR_VERSION}:build.majorVersion=${YEAR}:g" ${DELEGATE_VERSION_FILE}
+sed -i "s:build.minorVersion=${MINOR_VERSION}:build.minorVersion=${MONTH}:g" ${DELEGATE_VERSION_FILE}
+
+
+git add ${DELEGATE_VERSION_FILE}
+git commit -m "Branching to release/${PURPOSE}/${VERSION}xx. New version ${NEW_VERSION}xx"
+git push origin develop
+print_err "$?" "Pushing delegate build.properties to develop branch failed"
+
 # Update jira issues
 echo "STEP4: INFO: Update jira issues"
 git fetch origin refs/heads/master; git checkout master && git branch