break backwards compat

Author: mschuwalow

cli/golem-cli/wit/deps/golem-1.x/golem-oplog.wit

@@ -106,7 +106,8 @@ interface oplog {
         initial-total-linear-memory-size: u64,
         initial-active-plugins: list<plugin-installation-description>,
         local-agent-config: list<local-agent-config-entry>,
-        original-phantom-id: option<uuid>
+        original-phantom-id: option<uuid>,
+        instance-id: uuid
     }
 
     record host-call-parameters {
@@ -454,8 +455,7 @@ interface oplog {
         initial-active-plugins: list<environment-plugin-grant-id>,
         local-agent-config: list<raw-local-agent-config-entry>,
         original-phantom-id: option<uuid>,
-        /// Per-instance UUID. None for agents created before this field was introduced.
-        instance-id: option<uuid>
+        instance-id: uuid
     }
 
     record raw-host-call-parameters {

golem-api-grpc/proto/golem/worker/public_oplog.proto

@@ -97,6 +97,7 @@ message CreateParameters {
   repeated PluginInstallationDescription initial_active_plugins = 11;
   golem.common.EnvironmentId environment_id = 12;
   optional golem.common.UUID original_phantom_id = 13;
+  golem.common.UUID instance_id = 14;
 }
 
 message HostCallParameters {

golem-common/src/base_model/mod.rs

@@ -165,72 +165,36 @@ impl FromValue for Timestamp {
     }
 }
 
+/// A stable, per-instance fingerprint for a worker, generated as a random UUID at creation time.
+/// Globally unique across recreations of the same agent ID.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[cfg_attr(feature = "full", derive(desert_rust::BinaryCodec))]
-#[cfg_attr(feature = "full", desert(evolution()))]
-#[serde(tag = "type", content = "value", rename_all = "camelCase")]
-pub enum AgentFingerprint {
-    /// Randomly generated at worker creation time.  Globally unique across recreations.
-    Uuid(Uuid),
-    /// Fallback for workers created before `AgentFingerprint` was introduced.
-    /// The timestamp is the worker's `created_at` from the oplog `Create` entry.
-    Timestamp(Timestamp),
-}
+#[cfg_attr(
+    feature = "full",
+    derive(
+        desert_rust::BinaryCodec,
+        golem_wasm_derive::IntoValue,
+        golem_wasm_derive::FromValue,
+    )
+)]
+#[cfg_attr(feature = "full", desert(transparent))]
+#[serde(transparent)]
+pub struct AgentFingerprint(pub Uuid);
 
-impl Display for AgentFingerprint {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AgentFingerprint::Uuid(u) => write!(f, "uuid:{u}"),
-            AgentFingerprint::Timestamp(t) => write!(f, "ts:{t}"),
-        }
+impl Default for AgentFingerprint {
+    fn default() -> Self {
+        Self::new()
     }
 }
 
-#[cfg(feature = "full")]
-impl golem_wasm::IntoValue for AgentFingerprint {
-    fn into_value(self) -> golem_wasm::Value {
-        match self {
-            AgentFingerprint::Uuid(u) => {
-                golem_wasm::Value::Variant {
-                    case_idx: 0,
-                    case_value: Some(Box::new(u.into_value())),
-                }
-            }
-            AgentFingerprint::Timestamp(ts) => golem_wasm::Value::Variant {
-                case_idx: 1,
-                case_value: Some(Box::new(golem_wasm::Value::U64(ts.to_millis()))),
-            },
-        }
-    }
-
-    fn get_type() -> golem_wasm::analysis::AnalysedType {
-        use golem_wasm::analysis::analysed_type;
-        analysed_type::variant(vec![
-            analysed_type::case("uuid", Uuid::get_type()),
-            analysed_type::case("timestamp", u64::get_type()),
-        ])
+impl AgentFingerprint {
+    pub fn new() -> Self {
+        AgentFingerprint(Uuid::now_v7())
     }
 }
 
-#[cfg(feature = "full")]
-impl golem_wasm::FromValue for AgentFingerprint {
-    fn from_value(value: golem_wasm::Value) -> Result<Self, String> {
-        match value {
-            golem_wasm::Value::Variant {
-                case_idx: 0,
-                case_value: Some(inner),
-            } => Ok(AgentFingerprint::Uuid(Uuid::from_value(*inner)?)),
-            golem_wasm::Value::Variant {
-                case_idx: 1,
-                case_value: Some(inner),
-            } => match *inner {
-                golem_wasm::Value::U64(millis) => {
-                    Ok(AgentFingerprint::Timestamp(Timestamp::from(millis)))
-                }
-                other => Err(format!("Expected U64 for Timestamp fingerprint, got {other:?}")),
-            },
-            other => Err(format!("Expected Variant for AgentFingerprint, got {other:?}")),
-        }
+impl Display for AgentFingerprint {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
     }
 }
 

golem-common/src/base_model/oplog/mod.rs

@@ -65,7 +65,6 @@ use raw_imports::*;
 // - public: fields of the PublicOplogEntry case
 oplog_entry! {
     /// The first entry of every oplog
-    #[desert(evolution(FieldAdded("instance_id", None)))]
     Create {
         hint: false
         wit_raw_type: "raw-create-parameters"
@@ -82,7 +81,8 @@ oplog_entry! {
             initial_active_plugins: HashSet<EnvironmentPluginGrantId>,
             local_agent_config: Vec<UntypedAgentConfigEntry>,
             original_phantom_id: Option<Uuid>,
-            instance_id: Option<Uuid>
+            /// Per-instance fingerprint, unique across recreations of the same agent ID.
+            instance_id: Uuid
         }
         public {
             agent_id: AgentId,
@@ -95,7 +95,8 @@ oplog_entry! {
             initial_total_linear_memory_size: u64,
             initial_active_plugins: BTreeSet<PluginInstallationDescription>,
             local_agent_config: Vec<TypedAgentConfigEntry>,
-            original_phantom_id: Option<Uuid>
+            original_phantom_id: Option<Uuid>,
+            instance_id: Uuid
         }
     },
     /// The agent invoked a host function

golem-common/src/model/mod.rs

@@ -341,12 +341,11 @@ pub enum ScheduledAction {
     /// mismatch means the original worker was deleted and a new one was created with the same
     /// ID — the invocation is silently dropped. `None` means fire unconditionally (used for
     /// legacy entries and non-wasm-rpc invocations).
-    #[desert(evolution(FieldAdded("target_worker_fingerprint", None)))]
     Invoke {
         account_id: AccountId,
         owned_agent_id: OwnedAgentId,
         invocation: Box<AgentInvocation>,
-        target_worker_fingerprint: Option<AgentFingerprint>,
+        target_worker_fingerprint: AgentFingerprint,
     },
     /// Resume the agent
     Resume {

golem-common/src/model/oplog/payload/types.rs

@@ -1341,7 +1341,7 @@ pub enum SerializableWebsocketError {
 }
 
 #[derive(Debug, Clone, PartialEq, BinaryCodec, IntoValue, FromValue)]
-#[desert(evolution(FieldAdded("target_worker_fingerprint", None)))]
+#[desert(evolution())]
 #[wit_transparent]
 pub struct SerializableScheduledInvocation {
     pub timestamp: i64,
@@ -1355,7 +1355,7 @@ pub struct SerializableScheduledInvocation {
     pub trace_id: TraceId,
     pub trace_states: Vec<String>,
     pub spans: Vec<Vec<PublicSpanData>>,
-    pub target_worker_fingerprint: Option<AgentFingerprint>,
+    pub target_worker_fingerprint: AgentFingerprint,
 }
 
 impl SerializableScheduledInvocation {

golem-common/src/model/oplog/protobuf.rs

@@ -25,16 +25,11 @@ use super::{
     StringAttributeValue, WriteRemoteBatchedParameters, WriteRemoteTransactionParameters,
 };
 use crate::base_model::OplogIndex;
-use crate::model::AgentInvocationResult;
 use crate::model::Empty;
 use crate::model::agent::DataValue;
-use crate::model::agent::UntypedDataValue;
 use crate::model::component::PluginPriority;
 use crate::model::invocation_context::{SpanId, TraceId};
 use crate::model::oplog::payload::OplogPayload;
-use crate::model::oplog::payload::host_functions::{
-    HostFunctionName, host_request_from_value_and_type, host_response_from_value_and_type,
-};
 use crate::model::oplog::public_oplog_entry::{
     ActivatePluginParams, AgentInvocationFinishedParams, AgentInvocationStartedParams,
     BeginAtomicRegionParams, BeginRemoteTransactionParams, BeginRemoteWriteParams,
@@ -315,6 +310,10 @@ impl TryFrom<golem_api_grpc::proto::golem::worker::OplogEntry> for PublicOplogEn
                         .collect::<Result<Vec<_>, _>>()?,
                 ),
                 original_phantom_id: create.original_phantom_id.map(|id| id.into()),
+                instance_id: create
+                    .instance_id
+                    .map(|id| id.into())
+                    .ok_or("Missing instance_id in Create entry")?,
             })),
             oplog_entry::Entry::HostCall(host_call) => {
                 Ok(PublicOplogEntry::HostCall(HostCallParams {
@@ -759,6 +758,7 @@ impl TryFrom<PublicOplogEntry> for golem_api_grpc::proto::golem::worker::OplogEn
                             .map(Into::into)
                             .collect(),
                         original_phantom_id: create.original_phantom_id.map(|id| id.into()),
+                        instance_id: Some(create.instance_id.into()),
                     },
                 )),
             },
@@ -2419,7 +2419,7 @@ impl TryFrom<OplogEntry> for golem_api_grpc::proto::golem::worker::RawOplogEntry
                     .map(|e| crate::serialization::serialize(&e))
                     .collect::<Result<Vec<_>, _>>()?,
                 original_phantom_id: original_phantom_id.map(Into::into),
-                instance_id: instance_id.map(Into::into),
+                instance_id: Some(instance_id.into()),
             }),
             OplogEntry::HostCall {
                 function_name,
@@ -2750,10 +2750,10 @@ impl TryFrom<golem_api_grpc::proto::golem::worker::RawOplogEntry> for OplogEntry
                     let proto_uuid: golem_api_grpc::proto::golem::common::Uuid = u;
                     uuid::Uuid::from(proto_uuid)
                 });
-                let instance_id: Option<uuid::Uuid> = p.instance_id.map(|u| {
-                    let proto_uuid: golem_api_grpc::proto::golem::common::Uuid = u;
-                    uuid::Uuid::from(proto_uuid)
-                });
+                let instance_id: uuid::Uuid = p
+                    .instance_id
+                    .map(uuid::Uuid::from)
+                    .ok_or("Missing instance_id in Create entry")?;
                 Ok(OplogEntry::Create {
                     timestamp,
                     agent_id,

golem-common/src/model/oplog/tests.rs

@@ -93,6 +93,7 @@ fn create_serialization_poem_serde_equivalence() {
             parameters: BTreeMap::new(),
         }]),
         original_phantom_id: None,
+        instance_id: Uuid::new_v4(),
     });
     let serialized = entry.to_json_string();
     let deserialized: PublicOplogEntry = serde_json::from_str(&serialized).unwrap();

golem-common/src/model/tests.rs

@@ -17,7 +17,9 @@ use crate::model::environment::EnvironmentId;
 use crate::model::oplog::{OplogIndex, TimestampedUpdateDescription, UpdateDescription};
 use crate::model::worker::TypedAgentConfigEntry;
 use crate::model::{
-    AccountId, AgentFilter, AgentFingerprint, AgentId, AgentInvocation, AgentMetadata, AgentStatus, AgentStatusRecord, ComponentId, FilterComparator, IdempotencyKey, StringFilterComparator, Timestamp, TimestampedAgentInvocation
+    AccountId, AgentFilter, AgentFingerprint, AgentId, AgentInvocation, AgentMetadata, AgentStatus,
+    AgentStatusRecord, ComponentId, FilterComparator, IdempotencyKey, StringFilterComparator,
+    Timestamp, TimestampedAgentInvocation,
 };
 use desert_rust::BinaryCodec;
 use golem_wasm::ValueAndType;
@@ -226,7 +228,7 @@ fn worker_filter_matches() {
             ..AgentStatusRecord::default()
         },
         original_phantom_id: None,
-        fingerprint: AgentFingerprint::Uuid(Uuid::now_v7())
+        fingerprint: AgentFingerprint(Uuid::now_v7()),
     };
 
     assert!(

golem-common/wit/deps/golem-1.x/golem-oplog.wit

@@ -106,7 +106,8 @@ interface oplog {
         initial-total-linear-memory-size: u64,
         initial-active-plugins: list<plugin-installation-description>,
         local-agent-config: list<local-agent-config-entry>,
-        original-phantom-id: option<uuid>
+        original-phantom-id: option<uuid>,
+        instance-id: uuid
     }
 
     record host-call-parameters {
@@ -454,8 +455,7 @@ interface oplog {
         initial-active-plugins: list<environment-plugin-grant-id>,
         local-agent-config: list<raw-local-agent-config-entry>,
         original-phantom-id: option<uuid>,
-        /// Per-instance UUID. None for agents created before this field was introduced.
-        instance-id: option<uuid>
+        instance-id: uuid
     }
 
     record raw-host-call-parameters {