Merge C20 tracing beyond the router
Conflicts: config imports and docgen sources (both kept); agent.pb.go regenerated with buf from the merged proto (MIG devices and trace context). Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
801e2d51c0
33 files changed
+1608
-144
No files matched your search
@@ -272,7 +272,13 @@ type ControlMessage struct {
|
||||
// *ControlMessage_FabricTest
|
||||
// *ControlMessage_Upgrade
|
||||
// *ControlMessage_ControlPlanes
|
||||
Msg isControlMessage_Msg `protobuf_oneof:"msg"`
|
||||
Msg isControlMessage_Msg `protobuf_oneof:"msg"`
|
||||
// trace is the W3C trace context (traceparent, and tracestate when there
|
||||
// is one) of the control plane's span that sent this command, so what the
|
||||
// agent does for it — fetching weights, launching the engine, waiting for
|
||||
// it to answer — lands in the same trace. Empty when the control plane is
|
||||
// not tracing, and ignored by an agent that is not.
|
||||
Trace map[string]string `protobuf:"bytes,12,rep,name=trace,proto3" json:"trace,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@@ -413,6 +419,13 @@ func (x *ControlMessage) GetControlPlanes() *ControlPlanes {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *ControlMessage) GetTrace() map[string]string {
|
||||
if x != nil {
|
||||
return x.Trace
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type isControlMessage_Msg interface {
|
||||
isControlMessage_Msg()
|
||||
}
|
||||
@@ -4236,7 +4249,7 @@ const file_llmgw_v1_agent_proto_rawDesc = "" +
|
||||
"\vfabric_test\x18\x06 \x01(\v2\x19.llmgw.v1.FabricTestReplyH\x00R\n" +
|
||||
"fabricTest\x122\n" +
|
||||
"\aupgrade\x18\a \x01(\v2\x16.llmgw.v1.UpgradeReplyH\x00R\aupgradeB\x05\n" +
|
||||
"\x03msg\"\xdb\x04\n" +
|
||||
"\x03msg\"\xd0\x05\n" +
|
||||
"\x0eControlMessage\x12,\n" +
|
||||
"\x05start\x18\x01 \x01(\v2\x14.llmgw.v1.StartShardH\x00R\x05start\x12)\n" +
|
||||
"\x04stop\x18\x02 \x01(\v2\x13.llmgw.v1.StopShardH\x00R\x04stop\x12,\n" +
|
||||
@@ -4251,7 +4264,12 @@ const file_llmgw_v1_agent_proto_rawDesc = "" +
|
||||
"fabricTest\x122\n" +
|
||||
"\aupgrade\x18\n" +
|
||||
" \x01(\v2\x16.llmgw.v1.UpgradeAgentH\x00R\aupgrade\x12@\n" +
|
||||
"\x0econtrol_planes\x18\v \x01(\v2\x17.llmgw.v1.ControlPlanesH\x00R\rcontrolPlanesB\x05\n" +
|
||||
"\x0econtrol_planes\x18\v \x01(\v2\x17.llmgw.v1.ControlPlanesH\x00R\rcontrolPlanes\x129\n" +
|
||||
"\x05trace\x18\f \x03(\v2#.llmgw.v1.ControlMessage.TraceEntryR\x05trace\x1a8\n" +
|
||||
"\n" +
|
||||
"TraceEntry\x12\x10\n" +
|
||||
"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
|
||||
"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\x05\n" +
|
||||
"\x03msg\")\n" +
|
||||
"\rControlPlanes\x12\x18\n" +
|
||||
"\aservers\x18\x01 \x03(\tR\aservers\"\x80\a\n" +
|
||||
@@ -4650,7 +4668,7 @@ func file_llmgw_v1_agent_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_llmgw_v1_agent_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_llmgw_v1_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 45)
|
||||
var file_llmgw_v1_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 46)
|
||||
var file_llmgw_v1_agent_proto_goTypes = []any{
|
||||
(ShardStatus_State)(0), // 0: llmgw.v1.ShardStatus.State
|
||||
(*AgentMessage)(nil), // 1: llmgw.v1.AgentMessage
|
||||
@@ -4692,12 +4710,13 @@ var file_llmgw_v1_agent_proto_goTypes = []any{
|
||||
(*UpgradeAgent)(nil), // 37: llmgw.v1.UpgradeAgent
|
||||
(*UpgradeReply)(nil), // 38: llmgw.v1.UpgradeReply
|
||||
(*LoraAdapter)(nil), // 39: llmgw.v1.LoraAdapter
|
||||
nil, // 40: llmgw.v1.Register.LabelsEntry
|
||||
nil, // 41: llmgw.v1.Register.EngineVersionsEntry
|
||||
nil, // 42: llmgw.v1.GPU.NicPathsEntry
|
||||
nil, // 43: llmgw.v1.IBPort.CountersEntry
|
||||
nil, // 44: llmgw.v1.Heartbeat.EngineVersionsEntry
|
||||
nil, // 45: llmgw.v1.EngineProfile.EnvEntry
|
||||
nil, // 40: llmgw.v1.ControlMessage.TraceEntry
|
||||
nil, // 41: llmgw.v1.Register.LabelsEntry
|
||||
nil, // 42: llmgw.v1.Register.EngineVersionsEntry
|
||||
nil, // 43: llmgw.v1.GPU.NicPathsEntry
|
||||
nil, // 44: llmgw.v1.IBPort.CountersEntry
|
||||
nil, // 45: llmgw.v1.Heartbeat.EngineVersionsEntry
|
||||
nil, // 46: llmgw.v1.EngineProfile.EnvEntry
|
||||
}
|
||||
var file_llmgw_v1_agent_proto_depIdxs = []int32{
|
||||
4, // 0: llmgw.v1.AgentMessage.register:type_name -> llmgw.v1.Register
|
||||
@@ -4718,44 +4737,45 @@ var file_llmgw_v1_agent_proto_depIdxs = []int32{
|
||||
35, // 15: llmgw.v1.ControlMessage.fabric_test:type_name -> llmgw.v1.FabricTestRequest
|
||||
37, // 16: llmgw.v1.ControlMessage.upgrade:type_name -> llmgw.v1.UpgradeAgent
|
||||
3, // 17: llmgw.v1.ControlMessage.control_planes:type_name -> llmgw.v1.ControlPlanes
|
||||
40, // 18: llmgw.v1.Register.labels:type_name -> llmgw.v1.Register.LabelsEntry
|
||||
8, // 19: llmgw.v1.Register.gpus:type_name -> llmgw.v1.GPU
|
||||
10, // 20: llmgw.v1.Register.fabrics:type_name -> llmgw.v1.FabricAttachment
|
||||
41, // 21: llmgw.v1.Register.engine_versions:type_name -> llmgw.v1.Register.EngineVersionsEntry
|
||||
7, // 22: llmgw.v1.Register.running_shards:type_name -> llmgw.v1.RunningShard
|
||||
11, // 23: llmgw.v1.Register.weights:type_name -> llmgw.v1.LocalWeights
|
||||
6, // 24: llmgw.v1.Register.storage:type_name -> llmgw.v1.Storage
|
||||
5, // 25: llmgw.v1.Register.host:type_name -> llmgw.v1.Host
|
||||
17, // 26: llmgw.v1.Register.imex:type_name -> llmgw.v1.IMEX
|
||||
0, // 27: llmgw.v1.RunningShard.state:type_name -> llmgw.v1.ShardStatus.State
|
||||
42, // 28: llmgw.v1.GPU.nic_paths:type_name -> llmgw.v1.GPU.NicPathsEntry
|
||||
9, // 29: llmgw.v1.GPU.mig:type_name -> llmgw.v1.MIGDevice
|
||||
14, // 30: llmgw.v1.NodeLoad.shards:type_name -> llmgw.v1.ShardLoad
|
||||
13, // 31: llmgw.v1.NodeLoad.gpus:type_name -> llmgw.v1.GPUSensor
|
||||
43, // 32: llmgw.v1.IBPort.counters:type_name -> llmgw.v1.IBPort.CountersEntry
|
||||
16, // 33: llmgw.v1.IBPort.subnet_managers:type_name -> llmgw.v1.SubnetManager
|
||||
6, // 34: llmgw.v1.Heartbeat.storage:type_name -> llmgw.v1.Storage
|
||||
11, // 35: llmgw.v1.Heartbeat.weights:type_name -> llmgw.v1.LocalWeights
|
||||
44, // 36: llmgw.v1.Heartbeat.engine_versions:type_name -> llmgw.v1.Heartbeat.EngineVersionsEntry
|
||||
22, // 37: llmgw.v1.Heartbeat.provision:type_name -> llmgw.v1.ProvisionStatus
|
||||
12, // 38: llmgw.v1.Heartbeat.load:type_name -> llmgw.v1.NodeLoad
|
||||
15, // 39: llmgw.v1.Heartbeat.ib_ports:type_name -> llmgw.v1.IBPort
|
||||
10, // 40: llmgw.v1.Heartbeat.fabrics:type_name -> llmgw.v1.FabricAttachment
|
||||
18, // 41: llmgw.v1.Heartbeat.gpu_fabric:type_name -> llmgw.v1.GPUFabricState
|
||||
17, // 42: llmgw.v1.Heartbeat.imex:type_name -> llmgw.v1.IMEX
|
||||
21, // 43: llmgw.v1.Provision.engines:type_name -> llmgw.v1.EngineWant
|
||||
0, // 44: llmgw.v1.ShardStatus.state:type_name -> llmgw.v1.ShardStatus.State
|
||||
24, // 45: llmgw.v1.ShardStatus.fetch:type_name -> llmgw.v1.FetchProgress
|
||||
26, // 46: llmgw.v1.StartShard.profile:type_name -> llmgw.v1.EngineProfile
|
||||
45, // 47: llmgw.v1.EngineProfile.env:type_name -> llmgw.v1.EngineProfile.EnvEntry
|
||||
39, // 48: llmgw.v1.EngineProfile.adapters:type_name -> llmgw.v1.LoraAdapter
|
||||
1, // 49: llmgw.v1.AgentService.Connect:input_type -> llmgw.v1.AgentMessage
|
||||
2, // 50: llmgw.v1.AgentService.Connect:output_type -> llmgw.v1.ControlMessage
|
||||
50, // [50:51] is the sub-list for method output_type
|
||||
49, // [49:50] is the sub-list for method input_type
|
||||
49, // [49:49] is the sub-list for extension type_name
|
||||
49, // [49:49] is the sub-list for extension extendee
|
||||
0, // [0:49] is the sub-list for field type_name
|
||||
40, // 18: llmgw.v1.ControlMessage.trace:type_name -> llmgw.v1.ControlMessage.TraceEntry
|
||||
41, // 19: llmgw.v1.Register.labels:type_name -> llmgw.v1.Register.LabelsEntry
|
||||
8, // 20: llmgw.v1.Register.gpus:type_name -> llmgw.v1.GPU
|
||||
10, // 21: llmgw.v1.Register.fabrics:type_name -> llmgw.v1.FabricAttachment
|
||||
42, // 22: llmgw.v1.Register.engine_versions:type_name -> llmgw.v1.Register.EngineVersionsEntry
|
||||
7, // 23: llmgw.v1.Register.running_shards:type_name -> llmgw.v1.RunningShard
|
||||
11, // 24: llmgw.v1.Register.weights:type_name -> llmgw.v1.LocalWeights
|
||||
6, // 25: llmgw.v1.Register.storage:type_name -> llmgw.v1.Storage
|
||||
5, // 26: llmgw.v1.Register.host:type_name -> llmgw.v1.Host
|
||||
17, // 27: llmgw.v1.Register.imex:type_name -> llmgw.v1.IMEX
|
||||
0, // 28: llmgw.v1.RunningShard.state:type_name -> llmgw.v1.ShardStatus.State
|
||||
43, // 29: llmgw.v1.GPU.nic_paths:type_name -> llmgw.v1.GPU.NicPathsEntry
|
||||
9, // 30: llmgw.v1.GPU.mig:type_name -> llmgw.v1.MIGDevice
|
||||
14, // 31: llmgw.v1.NodeLoad.shards:type_name -> llmgw.v1.ShardLoad
|
||||
13, // 32: llmgw.v1.NodeLoad.gpus:type_name -> llmgw.v1.GPUSensor
|
||||
44, // 33: llmgw.v1.IBPort.counters:type_name -> llmgw.v1.IBPort.CountersEntry
|
||||
16, // 34: llmgw.v1.IBPort.subnet_managers:type_name -> llmgw.v1.SubnetManager
|
||||
6, // 35: llmgw.v1.Heartbeat.storage:type_name -> llmgw.v1.Storage
|
||||
11, // 36: llmgw.v1.Heartbeat.weights:type_name -> llmgw.v1.LocalWeights
|
||||
45, // 37: llmgw.v1.Heartbeat.engine_versions:type_name -> llmgw.v1.Heartbeat.EngineVersionsEntry
|
||||
22, // 38: llmgw.v1.Heartbeat.provision:type_name -> llmgw.v1.ProvisionStatus
|
||||
12, // 39: llmgw.v1.Heartbeat.load:type_name -> llmgw.v1.NodeLoad
|
||||
15, // 40: llmgw.v1.Heartbeat.ib_ports:type_name -> llmgw.v1.IBPort
|
||||
10, // 41: llmgw.v1.Heartbeat.fabrics:type_name -> llmgw.v1.FabricAttachment
|
||||
18, // 42: llmgw.v1.Heartbeat.gpu_fabric:type_name -> llmgw.v1.GPUFabricState
|
||||
17, // 43: llmgw.v1.Heartbeat.imex:type_name -> llmgw.v1.IMEX
|
||||
21, // 44: llmgw.v1.Provision.engines:type_name -> llmgw.v1.EngineWant
|
||||
0, // 45: llmgw.v1.ShardStatus.state:type_name -> llmgw.v1.ShardStatus.State
|
||||
24, // 46: llmgw.v1.ShardStatus.fetch:type_name -> llmgw.v1.FetchProgress
|
||||
26, // 47: llmgw.v1.StartShard.profile:type_name -> llmgw.v1.EngineProfile
|
||||
46, // 48: llmgw.v1.EngineProfile.env:type_name -> llmgw.v1.EngineProfile.EnvEntry
|
||||
39, // 49: llmgw.v1.EngineProfile.adapters:type_name -> llmgw.v1.LoraAdapter
|
||||
1, // 50: llmgw.v1.AgentService.Connect:input_type -> llmgw.v1.AgentMessage
|
||||
2, // 51: llmgw.v1.AgentService.Connect:output_type -> llmgw.v1.ControlMessage
|
||||
51, // [51:52] is the sub-list for method output_type
|
||||
50, // [50:51] is the sub-list for method input_type
|
||||
50, // [50:50] is the sub-list for extension type_name
|
||||
50, // [50:50] is the sub-list for extension extendee
|
||||
0, // [0:50] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_llmgw_v1_agent_proto_init() }
|
||||
@@ -4791,7 +4811,7 @@ func file_llmgw_v1_agent_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: unsafe.Slice(unsafe.StringData(file_llmgw_v1_agent_proto_rawDesc), len(file_llmgw_v1_agent_proto_rawDesc)),
|
||||
NumEnums: 1,
|
||||
NumMessages: 45,
|
||||
NumMessages: 46,
|
||||
NumExtensions: 0,
|
||||
NumServices: 1,
|
||||
},
|
||||
|
||||
@@ -45,6 +45,12 @@ message ControlMessage {
|
||||
UpgradeAgent upgrade = 10;
|
||||
ControlPlanes control_planes = 11;
|
||||
}
|
||||
// trace is the W3C trace context (traceparent, and tracestate when there
|
||||
// is one) of the control plane's span that sent this command, so what the
|
||||
// agent does for it — fetching weights, launching the engine, waiting for
|
||||
// it to answer — lands in the same trace. Empty when the control plane is
|
||||
// not tracing, and ignored by an agent that is not.
|
||||
map<string, string> trace = 12;
|
||||
}
|
||||
|
||||
// ControlPlanes is every control plane an agent may dial, sent by the leader
|
||||
|
||||
Reference in new issue
Block a user