Merge pull request #3000 from aws-observability/rmprint

[chore] Remove print statements and add unit test in script

Author: vasireddy99

.github/scripts/test-collector-ctl.sh

@@ -87,12 +87,26 @@ test_collector_ctl_with_samecfg_restart() {
 }
 
 test_collector_ctl_with_featureflag() {
-    #staart coll default conf by starting without -c
+    #start collector with default config
     $ADOT_CTL -a start -f "-adot.exporter.datadogexporter.deprecation"
 
     echo "${FUNCNAME[0]} ... OK"
 }
 
+test_collector_ctl_with_featureflag_samecfg_restart() {
+    #populate default conf by starting without -c
+    $ADOT_CTL -a start -f "-adot.exporter.signalfx.deprecation"
+
+    #restarting with different flags and -c should start collector as expected
+    $ADOT_CTL -a start -c "file:/opt/aws/aws-otel-collector/etc/config.yaml" -f "-adot.exporter.datadogexporter.deprecation"
+    $ADOT_CTL -a status
+    echo "==============================================="
+    echo "Contents of $ENV_FILE:"
+    cat "$ENV_FILE"
+    echo "==============================================="
+    echo "${FUNCNAME[0]} ... OK"
+}
+
 setup
 
 ## Tests
@@ -101,3 +115,4 @@ test_collector_ctl_with_sed_special_chars
 test_collector_ctl_with_samecfg
 test_collector_ctl_with_samecfg_restart
 test_collector_ctl_with_featureflag
+test_collector_ctl_with_featureflag_samecfg_restart

tools/ctl/linux/aws-otel-collector-ctl.sh

@@ -75,7 +75,7 @@ aoc_config_local_uri() {
 
 
     if [ -n "$config" ] && [ -f "$config" ]; then
-        # do not copy if the default congif directory is provided for the -f flag.
+        # do not copy if the default config directory is provided for the -f flag.
         # copying a file to the same location produces an error. 
         if [ ! "$config" = "$CONFDIR/config.yaml" ]; then
             cp "$config" $CONFDIR/config.yaml
@@ -91,11 +91,10 @@ aoc_config_feature_gates() {
 
     sed -i '/^feature_gates=.*$/d' $ENV_FILE
     if [ -n "$feature_gates" ]; then
-        echo "feature_gates=\"--feature-gates='${feature_gates}'\"" >> $ENV_FILE
+        echo "feature_gates=\"--feature-gates '${feature_gates}'\"" >> $ENV_FILE
     fi
 }
 
-
 # Used in case the collector starts for the first time without a configuration parameter
 # Safe to run as this will not overwrite a file if one exists in default location already.
 aoc_ensure_default_config() {

tools/ctl/windows/aws-otel-collector-ctl.ps1

@@ -89,8 +89,6 @@ Function Get-Service-Config-Uri() {
     return $Matches.1
 }
 
-
-
 Function Set-Service-Config-Uri ([string]$uri) {
     $aoc_cmd = "\""${AOCProgramFiles}\.aws-otel-collector.exe\""  --config=\""${uri}\"""
     sc.exe config "${AOCServiceName}" binPath= "${aoc_cmd}"
@@ -112,7 +110,6 @@ Function AOCStart() {
 
     # Check for feature gates before configuring service
     if ($FeatureGates) {
-        Write-Output "Applying feature gate"
         if (Test-Remote-Uri $ConfigLocation) {
            Set-Service-Config-Uri-With-FeatureGates ${ConfigLocation} ${FeatureGates}
         } else {