From e8e2d24606dc6dda83721e3e613dd59ebaf5ea80 Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 20 Apr 2021 08:53:06 -0700 Subject: [PATCH] Set RAFT_LOCAL to custom value to identify running environment. --- cli/raft_local.py | 10 +++++++++- src/Agent/RESTlerAgent/AgentMain.fs | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/raft_local.py b/cli/raft_local.py index cbfbb90e..fba4aa17 100644 --- a/cli/raft_local.py +++ b/cli/raft_local.py @@ -182,7 +182,15 @@ def common_environment_variables(self, job_id, work_dir): env += self.env_variable('RAFT_APP_INSIGHTS_KEY', '00000000-0000-0000-0000-000000000000') env += self.env_variable('RAFT_SITE_HASH', '0') env += self.env_variable('RAFT_SB_OUT_SAS', 'dummy_sas') - env += self.env_variable('RAFT_LOCAL', '1') + + # If we are running in a github action (or some other unique environment) + # we will set this value before running + # to distinquish between the different environments. + customLocal = os.getenv("RAFT_LOCAL") + if customLocal is None: + env += self.env_variable('RAFT_LOCAL', 'Developer') + else: + env += self.env_variable('RAFT_LOCAL', customLocal) return env def docker_create_bridge(self, job_id): diff --git a/src/Agent/RESTlerAgent/AgentMain.fs b/src/Agent/RESTlerAgent/AgentMain.fs index 2243a9e4..294ffd0e 100644 --- a/src/Agent/RESTlerAgent/AgentMain.fs +++ b/src/Agent/RESTlerAgent/AgentMain.fs @@ -586,7 +586,7 @@ let main argv = let telemetryTag = match System.Environment.GetEnvironmentVariable("RAFT_LOCAL") |> Option.ofObj with | None -> "RAFT" - | Some _ -> "RAFT-LOCAL" + | Some t -> sprintf "RAFT-LOCAL(%s)" t use telemetryClient = new Restler.Telemetry.TelemetryClient(siteHash, (if agentConfiguration.TelemetryOptOut then "" else Restler.Telemetry.InstrumentationKey), telemetryTag) if not <| IO.Directory.Exists workDirectory then