Merge pull request #6399 from Algo-devops-service/relbeta4.2.1

Author: algojohnlee

.github/workflows/ci-pr.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - master
+      - 'rel/**'
 
 env:
   CODECOV_TOKEN: "8b4a1f91-f154-4c26-b84c-c9aaa90159c6"  # Same public token from CircleCI config
@@ -11,7 +12,7 @@ env:
   BUILD_TYPE: integration
   ALGOTEST: 1
   SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-  
+
 concurrency:
   group: pr-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true

buildnumber.dat

@@ -1 +1 @@
-0
+1

cmd/diagcfg/telemetry.go

@@ -55,7 +55,12 @@ func maybeUpdateDataDirFromEnv() {
 
 func readTelemetryConfigOrExit() logging.TelemetryConfig {
 	maybeUpdateDataDirFromEnv()
-	cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, "")
+	globalDir, err := config.GetGlobalConfigFileRoot()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
+		os.Exit(1)
+	}
+	cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, globalDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
 		os.Exit(1)
@@ -112,7 +117,12 @@ var telemetryStatusCmd = &cobra.Command{
 	Long:  `Print the node's telemetry status`,
 	Run: func(cmd *cobra.Command, args []string) {
 		maybeUpdateDataDirFromEnv()
-		cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, "")
+		globalDir, err := config.GetGlobalConfigFileRoot()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
+			os.Exit(1)
+		}
+		cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, globalDir)
 
 		// If error loading config, can't disable / no need to disable
 		if err != nil {

logging/telemetry.go

@@ -89,7 +89,7 @@ func makeTelemetryStateContext(ctx context.Context, cfg TelemetryConfig, hookFac
 }
 
 // ReadTelemetryConfigOrDefault reads telemetry config from file or defaults if no config file found.
-func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg TelemetryConfig, err error) {
+func ReadTelemetryConfigOrDefault(dataDir string, globalDir string) (cfg TelemetryConfig, err error) {
 	err = nil
 	dataDirProvided := dataDir != ""
 	var configPath string
@@ -106,7 +106,7 @@ func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg Telemet
 	// If the reason is because the directory doesn't exist or we didn't provide a data directory then...
 	if (err != nil && os.IsNotExist(err)) || !dataDirProvided {
 
-		configPath = filepath.Join(configDir, TelemetryConfigFilename)
+		configPath = filepath.Join(globalDir, TelemetryConfigFilename)
 		cfg, err = LoadTelemetryConfig(configPath)
 	}
 
@@ -129,8 +129,8 @@ func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg Telemet
 // EnsureTelemetryConfig creates a new TelemetryConfig structure with a generated GUID and the appropriate Telemetry endpoint
 // Err will be non-nil if the file doesn't exist, or if error loading.
 // Cfg will always be valid.
-func EnsureTelemetryConfig(dataDir *string, configDir *string) (TelemetryConfig, error) {
-	cfg, _, err := EnsureTelemetryConfigCreated(dataDir, configDir)
+func EnsureTelemetryConfig(dataDir *string, globalDir *string) (TelemetryConfig, error) {
+	cfg, _, err := EnsureTelemetryConfigCreated(dataDir, globalDir)
 	return cfg, err
 }