Remove optional from outcome.proto (#41827)

Gets rid of some TODOs and some error handling code that is now unnecessary. GitOrigin-RevId: d540891cb19699e68d3c8bd27c02d770ed7b4f7d

Author: nipunn1313

crates/pb/protos/outcome.proto

@@ -17,11 +17,11 @@ message FunctionOutcome {
 }
 
 message UdfOutcome {
- optional bytes rng_seed = 1;
- optional bool observed_rng = 2;
+ bytes rng_seed = 1;
+ bool observed_rng = 2;
 
- optional google.protobuf.Timestamp unix_timestamp = 3;
- optional bool observed_time = 4;
+ google.protobuf.Timestamp unix_timestamp = 3;
+ bool observed_time = 4;
 
  reserved 5;
  repeated LogLine log_lines = 9;
@@ -30,12 +30,12 @@ message UdfOutcome {
  common.FunctionResult result = 7;
  SyscallTrace syscall_trace = 8;
 
- optional bool observed_identity = 10;
+ bool observed_identity = 10;
  uint64 memory_in_mb = 11;
 }
 
 message ActionOutcome {
- optional google.protobuf.Timestamp unix_timestamp = 3;
+ google.protobuf.Timestamp unix_timestamp = 3;
 
  reserved 5;
  reserved 9;
@@ -53,18 +53,18 @@ message HttpActionOutcome {
 
  uint64 memory_in_mb = 4;
 
- optional string path = 5;
- optional string method = 6;
+ string path = 5;
+ string method = 6;
 }
 
 message SyscallTrace {
  map<string, SyscallStats> async_syscalls = 1;
 }
 
 message SyscallStats {
- optional uint32 invocations = 1;
- optional uint32 errors = 2;
- optional google.protobuf.Duration total_duration = 3;
+ uint32 invocations = 1;
+ uint32 errors = 2;
+ google.protobuf.Duration total_duration = 3;
 }
 
 message SystemLogMetadata {
@@ -76,7 +76,7 @@ message StructuredLogLine {
  string level = 2;
  bool is_truncated = 3;
  google.protobuf.Timestamp timestamp = 4;
- optional SystemLogMetadata system_metadata = 5;
+ SystemLogMetadata system_metadata = 5;
  repeated string messages = 6;
 }
 

crates/udf/src/action_outcome.rs

@@ -241,15 +241,7 @@ impl HttpActionOutcome {
  },
  None => HttpActionResult::Streamed,
  };
- // TODO: Add `.context()` and remove fallback to `HttpRequestHead`
- let method = match method {
- Some(m) => m.parse()?,
- None => http_request.method.clone().try_into()?,
- };
- let path = match path {
- Some(p) => p,
- None => http_request.url.to_string(),
- };
+ let method = method.parse()?;
  Ok(Self {
  identity,
  unix_timestamp: unix_timestamp
@@ -291,8 +283,8 @@ impl TryFrom<HttpActionOutcome> for HttpActionOutcomeProto {
  result: Some(FunctionResultProto { result }),
  syscall_trace: Some(syscall_trace.try_into()?),
  memory_in_mb,
- path: Some(route.path.to_string()),
- method: Some(route.method.to_string()),
+ path: route.path.to_string(),
+ method: route.method.to_string(),
  })
  }
 }

crates/udf/src/syscall_stats.rs

@@ -66,8 +66,8 @@ impl TryFrom<SyscallStats> for SyscallStatsProto {
  }: SyscallStats,
  ) -> anyhow::Result<Self> {
  Ok(Self {
- invocations: Some(invocations),
- errors: Some(errors),
+ invocations,
+ errors,
  total_duration: Some(total_duration.try_into()?),
  })
  }
@@ -84,9 +84,8 @@ impl TryFrom<SyscallStatsProto> for SyscallStats {
  }: SyscallStatsProto,
  ) -> anyhow::Result<Self> {
  Ok(Self {
- invocations: invocations.ok_or_else(|| anyhow::anyhow!("Missing invocations"))?,
- errors: errors
- .ok_or_else(|| anyhow::anyhow!("Missing errors in SyscallStats deserialization"))?,
+ invocations,
+ errors,
  total_duration: total_duration
  .ok_or_else(|| anyhow::anyhow!("Missing total duration"))?
  .try_into()?,

crates/udf/src/udf_outcome.rs

@@ -101,17 +101,17 @@ impl TryFrom<UdfOutcome> for UdfOutcomeProto {
  Err(js_error) => FunctionResultTypeProto::JsError(js_error.try_into()?),
  };
  Ok(Self {
- rng_seed: Some(rng_seed.to_vec()),
- observed_rng: Some(observed_rng),
+ rng_seed: rng_seed.to_vec(),
+ observed_rng,
  unix_timestamp: Some(unix_timestamp.into()),
- observed_time: Some(observed_time),
+ observed_time,
  log_lines: log_lines.into_iter().map(|l| l.into()).collect(),
  journal: Some(journal.into()),
  result: Some(FunctionResultProto {
  result: Some(result),
  }),
  syscall_trace: Some(syscall_trace.try_into()?),
- observed_identity: Some(observed_identity),
+ observed_identity,
  memory_in_mb,
  })
  }
@@ -162,7 +162,6 @@ impl UdfOutcome {
  path_and_args: ValidatedPathAndArgs,
  identity: InertIdentity,
  ) -> anyhow::Result<Self> {
- let rng_seed = rng_seed.ok_or_else(|| anyhow::anyhow!("Missing rng_seed"))?;
  let rng_seed = rng_seed
  .as_slice()
  .try_into()
@@ -182,11 +181,11 @@ impl UdfOutcome {
  arguments,
  identity,
  rng_seed,
- observed_rng: observed_rng.unwrap_or_default(),
+ observed_rng,
  unix_timestamp: unix_timestamp
  .ok_or_else(|| anyhow::anyhow!("Missing unix_timestamp"))?
  .try_into()?,
- observed_time: observed_time.unwrap_or_default(),
+ observed_time,
  log_lines,
  journal: journal
  .ok_or_else(|| anyhow::anyhow!("Missing journal"))?
@@ -196,8 +195,7 @@ impl UdfOutcome {
  .ok_or_else(|| anyhow::anyhow!("Missing syscall_trace"))?
  .try_into()?,
  udf_server_version,
- // TODO(lee): Remove the default once we've pushed all services.
- observed_identity: observed_identity.unwrap_or(true),
+ observed_identity,
  memory_in_mb,
  })
  }