Update Proxy heartbeat & logging (#502)

microsoft · Feb 4, 2021 · c5bb0f0 · c5bb0f0
1 parent 4abfbec
commit c5bb0f0
Show file tree

Hide file tree

Showing 7 changed files with 294 additions and 56 deletions.
diff --git a/src/agent/onefuzz-telemetry/src/lib.rs b/src/agent/onefuzz-telemetry/src/lib.rs
@@ -74,6 +74,7 @@ pub enum EventData {
     CoveragePathsImported(u64),
     CoverageMaxDepth(u64),
     ToolName(String),
+    Region(String),
 }
 
 impl EventData {
@@ -109,6 +110,7 @@ impl EventData {
             Self::CoverageMaxDepth(x) => ("coverage_paths_depth", x.to_string()),
             Self::Coverage(x) => ("coverage", x.to_string()),
             Self::ToolName(x) => ("tool_name", x.to_owned()),
+            Self::Region(x) => ("region", x.to_owned()),
         }
     }
 
@@ -146,6 +148,7 @@ impl EventData {
             Self::CoverageMaxDepth(_) => true,
             Self::Coverage(_) => true,
             Self::ToolName(_) => true,
+            Self::Region(_) => false,
         }
     }
 }

diff --git a/src/api-service/__app__/onefuzzlib/proxy.py b/src/api-service/__app__/onefuzzlib/proxy.py
@@ -5,6 +5,7 @@
 
 import datetime
 import logging
+import os
 from typing import List, Optional, Tuple
 
 from azure.mgmt.compute.models import VirtualMachine
@@ -23,6 +24,7 @@
 from .__version__ import __version__
 from .azure.auth import build_auth
 from .azure.containers import get_file_sas_url, save_blob
+from .azure.creds import get_instance_id
 from .azure.ip import get_public_ip
 from .azure.queue import get_queue_sas
 from .azure.storage import StorageType
@@ -211,6 +213,9 @@ def save_proxy_config(self) -> None:
             ),
             forwards=forwards,
             region=self.region,
+            instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
+            telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
+            instance_id=get_instance_id(),
         )
 
         save_blob(