ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-15 19:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

clarify telemetry key names at the service level (#769)

Browse Source
This commit is contained in:
bmc-msft
2021-04-05 15:23:03 -04:00
committed by GitHub
parent c452a8aff3
commit e21eafd135
8 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/agent/onefuzz-agent/src/tasks/config.rs
View File

@ -35,12 +35,8 @@ pub struct CommonConfig {
pub heartbeat_queue: Option<Url>, pub heartbeat_queue: Option<Url>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "instrumentation_key")]
pub instance_telemetry_key: Option<InstanceTelemetryKey>, pub instance_telemetry_key: Option<InstanceTelemetryKey>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "telemetry_key")]
pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>, pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>,
#[serde(default)] #[serde(default)]

8
src/agent/onefuzz-supervisor/src/config.rs
View File

@ -27,12 +27,8 @@ pub struct StaticConfig {
pub multi_tenant_domain: Option<String>, pub multi_tenant_domain: Option<String>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "instrumentation_key")]
pub instance_telemetry_key: Option<InstanceTelemetryKey>, pub instance_telemetry_key: Option<InstanceTelemetryKey>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "telemetry_key")]
pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>, pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>,
pub heartbeat_queue: Option<Url>, pub heartbeat_queue: Option<Url>,
@ -51,12 +47,8 @@ struct RawStaticConfig {
pub multi_tenant_domain: Option<String>, pub multi_tenant_domain: Option<String>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "instrumentation_key")]
pub instance_telemetry_key: Option<InstanceTelemetryKey>, pub instance_telemetry_key: Option<InstanceTelemetryKey>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "telemetry_key")]
pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>, pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>,
pub heartbeat_queue: Option<Url>, pub heartbeat_queue: Option<Url>,

4
src/api-service/__app__/onefuzzlib/extension.py
View File

@ -103,13 +103,13 @@ def build_pool_config(pool: Pool) -> str:
config = AgentConfig( config = AgentConfig(
pool_name=pool.name, pool_name=pool.name,
onefuzz_url=get_instance_url(), onefuzz_url=get_instance_url(),
instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
heartbeat_queue=get_queue_sas( heartbeat_queue=get_queue_sas(
"node-heartbeat", "node-heartbeat",
StorageType.config, StorageType.config,
add=True, add=True,
), ),
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"), instance_telemetry_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
microsoft_telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
instance_id=get_instance_id(), instance_id=get_instance_id(),
) )

4
src/api-service/__app__/onefuzzlib/proxy.py
View File

@ -222,8 +222,8 @@ class Proxy(ORMMixin):
), ),
forwards=forwards, forwards=forwards,
region=self.region, region=self.region,
instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"), instance_telemetry_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"), microsoft_telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
instance_id=get_instance_id(), instance_id=get_instance_id(),
) )

4
src/api-service/__app__/onefuzzlib/tasks/config.py
View File

@ -205,8 +205,8 @@ def build_task_config(
job_id=job_id, job_id=job_id,
task_id=task_id, task_id=task_id,
task_type=task_config.task.type, task_type=task_config.task.type,
instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"), instance_telemetry_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"), microsoft_telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
heartbeat_queue=get_queue_sas( heartbeat_queue=get_queue_sas(
"task-heartbeat", "task-heartbeat",
StorageType.config, StorageType.config,

4
src/api-service/__app__/pool/__init__.py
View File

@ -31,8 +31,8 @@ def set_config(pool: Pool) -> Pool:
pool.config = AgentConfig( pool.config = AgentConfig(
pool_name=pool.name, pool_name=pool.name,
onefuzz_url=get_instance_url(), onefuzz_url=get_instance_url(),
instrumentation_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"), instance_telemetry_key=os.environ.get("APPINSIGHTS_INSTRUMENTATIONKEY"),
telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"), microsoft_telemetry_key=os.environ.get("ONEFUZZ_TELEMETRY"),
heartbeat_queue=get_queue_sas( heartbeat_queue=get_queue_sas(
"node-heartbeat", "node-heartbeat",
StorageType.config, StorageType.config,

7
src/proxy-manager/src/config.rs
View File

@ -45,15 +45,8 @@ pub struct Forward {
#[derive(Debug, Deserialize, Serialize, PartialEq, Clone)] #[derive(Debug, Deserialize, Serialize, PartialEq, Clone)]
pub struct ConfigData { pub struct ConfigData {
pub instance_id: Uuid, pub instance_id: Uuid,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "instrumentation_key")]
pub instance_telemetry_key: Option<InstanceTelemetryKey>, pub instance_telemetry_key: Option<InstanceTelemetryKey>,
// TODO: remove the alias once the service has been updated to match
#[serde(alias = "telemetry_key")]
pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>, pub microsoft_telemetry_key: Option<MicrosoftTelemetryKey>,
pub region: String, pub region: String,
pub url: Url, pub url: Url,
pub notification: Url, pub notification: Url,

12
src/pytypes/onefuzztypes/models.py
View File

@ -362,8 +362,8 @@ class AgentConfig(BaseModel):
onefuzz_url: str onefuzz_url: str
pool_name: PoolName pool_name: PoolName
heartbeat_queue: Optional[str] heartbeat_queue: Optional[str]
instrumentation_key: Optional[str] instance_telemetry_key: Optional[str]
telemetry_key: Optional[str] microsoft_telemetry_key: Optional[str]
multi_tenant_domain: Optional[str] multi_tenant_domain: Optional[str]
instance_id: UUID instance_id: UUID
@ -373,8 +373,8 @@ class TaskUnitConfig(BaseModel):
job_id: UUID job_id: UUID
task_id: UUID task_id: UUID
task_type: TaskType task_type: TaskType
instrumentation_key: Optional[str] instance_telemetry_key: Optional[str]
telemetry_key: Optional[str] microsoft_telemetry_key: Optional[str]
heartbeat_queue: str heartbeat_queue: str
# command_queue: str # command_queue: str
input_queue: Optional[str] input_queue: Optional[str]
@ -433,8 +433,8 @@ class ProxyConfig(BaseModel):
notification: str notification: str
region: Region region: Region
forwards: List[Forward] forwards: List[Forward]
instrumentation_key: Optional[str] instance_telemetry_key: Optional[str]
telemetry_key: Optional[str] microsoft_telemetry_key: Optional[str]
instance_id: UUID instance_id: UUID