opensource/teleport
3
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-09-24 16:17:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

add summaries_generated count to SessionSummariesGeneratedRecord (#64278)

Browse Source 
Adds a new `summaries_generated` field to the `SessionSummariesGeneratedRecord`
proto message to track the number of session summaries generated per session
type and resource combination, in addition to the existing token counts.

Updates the reporter to increment this counter for each processed
summary event.

Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
This commit is contained in:
Tiago Silva
2026-03-04 21:27:47 +00:00
committed by GitHub
parent 40a16fcc28
commit 0ad811bcbd
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen/proto/go/prehog/v1/teleport.pb.go
+14 -4
View File
@@ -1176,8 +1176,10 @@ type SessionSummariesGeneratedRecord struct {
TotalInputTokens uint64 `protobuf:"varint,4,opt,name=total_input_tokens,json=totalInputTokens,proto3" json:"total_input_tokens,omitempty"`
// total_output_tokens is number of total output tokens generated during the summary.
TotalOutputTokens uint64 `protobuf:"varint,5,opt,name=total_output_tokens,json=totalOutputTokens,proto3" json:"total_output_tokens,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
// number of summaries generated for this session type and resource combination.
SummariesGenerated uint64 `protobuf:"varint,6,opt,name=summaries_generated,json=summariesGenerated,proto3" json:"summaries_generated,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *SessionSummariesGeneratedRecord) Reset() {
@@ -1238,6 +1240,13 @@ func (x *SessionSummariesGeneratedRecord) GetTotalOutputTokens() uint64 {
return 0
}
func (x *SessionSummariesGeneratedRecord) GetSummariesGenerated() uint64 {
if x != nil {
return x.SummariesGenerated
}
return 0
}
type SubmitUsageReportsRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// at most 10 reports of all kinds in a single RPC, each shouldn't exceed 128KiB or so
@@ -1441,12 +1450,13 @@ const file_prehog_v1_teleport_proto_rawDesc = "" +
"\x0freporter_hostid\x18\x03 \x01(\fR\x0ereporterHostid\x129\n" +
"\n" +
"start_time\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampR\tstartTime\x12D\n" +
"\arecords\x18\x05 \x03(\v2*.prehog.v1.SessionSummariesGeneratedRecordR\arecords\"\xc7\x01\n" +
"\arecords\x18\x05 \x03(\v2*.prehog.v1.SessionSummariesGeneratedRecordR\arecords\"\xf8\x01\n" +
"\x1fSessionSummariesGeneratedRecord\x12!\n" +
"\fsession_type\x18\x01 \x01(\tR\vsessionType\x12#\n" +
"\rresource_name\x18\x02 \x01(\tR\fresourceName\x12,\n" +
"\x12total_input_tokens\x18\x04 \x01(\x04R\x10totalInputTokens\x12.\n" +
"\x13total_output_tokens\x18\x05 \x01(\x04R\x11totalOutputTokens\"\x8c\x03\n" +
"\x13total_output_tokens\x18\x05 \x01(\x04R\x11totalOutputTokens\x12/\n" +
"\x13summaries_generated\x18\x06 \x01(\x04R\x12summariesGenerated\"\x8c\x03\n" +
"\x19SubmitUsageReportsRequest\x12B\n" +
"\ruser_activity\x18\x01 \x03(\v2\x1d.prehog.v1.UserActivityReportR\fuserActivity\x12N\n" +
"\x11resource_presence\x18\x02 \x03(\v2!.prehog.v1.ResourcePresenceReportR\x10resourcePresence\x12X\n" +
gen/proto/ts/prehog/v1/teleport_pb.ts
Generated
+15 -1
View File
@@ -524,6 +524,12 @@ export interface SessionSummariesGeneratedRecord {
* @generated from protobuf field: uint64 total_output_tokens = 5;
*/
totalOutputTokens: bigint;
/**
* number of summaries generated for this session type and resource combination.
*
* @generated from protobuf field: uint64 summaries_generated = 6;
*/
summariesGenerated: bigint;
}
/**
* @generated from protobuf message prehog.v1.SubmitUsageReportsRequest
@@ -1538,7 +1544,8 @@ class SessionSummariesGeneratedRecord$Type extends MessageType<SessionSummariesG
{ no: 1, name: "session_type", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
{ no: 2, name: "resource_name", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
{ no: 4, name: "total_input_tokens", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ },
{ no: 5, name: "total_output_tokens", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ }
{ no: 5, name: "total_output_tokens", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ },
{ no: 6, name: "summaries_generated", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ }
]);
}
create(value?: PartialMessage<SessionSummariesGeneratedRecord>): SessionSummariesGeneratedRecord {
@@ -1547,6 +1554,7 @@ class SessionSummariesGeneratedRecord$Type extends MessageType<SessionSummariesG
message.resourceName = "";
message.totalInputTokens = 0n;
message.totalOutputTokens = 0n;
message.summariesGenerated = 0n;
if (value !== undefined)
reflectionMergePartial<SessionSummariesGeneratedRecord>(this, message, value);
return message;
@@ -1568,6 +1576,9 @@ class SessionSummariesGeneratedRecord$Type extends MessageType<SessionSummariesG
case /* uint64 total_output_tokens */ 5:
message.totalOutputTokens = reader.uint64().toBigInt();
break;
case /* uint64 summaries_generated */ 6:
message.summariesGenerated = reader.uint64().toBigInt();
break;
default:
let u = options.readUnknownField;
if (u === "throw")
@@ -1592,6 +1603,9 @@ class SessionSummariesGeneratedRecord$Type extends MessageType<SessionSummariesG
/* uint64 total_output_tokens = 5; */
if (message.totalOutputTokens !== 0n)
writer.tag(5, WireType.Varint).uint64(message.totalOutputTokens);
/* uint64 summaries_generated = 6; */
if (message.summariesGenerated !== 0n)
writer.tag(6, WireType.Varint).uint64(message.summariesGenerated);
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
lib/usagereporter/teleport/aggregating/reporter.go
+1
View File
@@ -344,6 +344,7 @@ func (r *Reporter) run(ctx context.Context) {
}
record.TotalInputTokens += inputTokens
record.TotalOutputTokens += outputTokens
record.SummariesGenerated++
}
botInstanceActivityStartTime := r.clock.Now().UTC().Truncate(botInstanceActivityReportGranularity)
lib/usagereporter/teleport/aggregating/reporter_test.go
+2
View File
@@ -615,12 +615,14 @@ func TestReporterIdentitySecuritySummariesGenerated(t *testing.T) {
require.Equal(t, anonymizer.AnonymizeString("server-01"), sshRecord.ResourceName)
require.Equal(t, uint64(250), sshRecord.TotalInputTokens) // 100 + 150
require.Equal(t, uint64(125), sshRecord.TotalOutputTokens) // 50 + 75
require.Equal(t, uint64(2), sshRecord.SummariesGenerated) // 2 successful summaries
require.NotNil(t, kubeRecord)
require.Equal(t, string(types.KubernetesSessionKind), kubeRecord.SessionType)
require.Equal(t, anonymizer.AnonymizeString("kube-cluster-01"), kubeRecord.ResourceName)
require.Equal(t, uint64(200), kubeRecord.TotalInputTokens)
require.Equal(t, uint64(100), kubeRecord.TotalOutputTokens)
require.Equal(t, uint64(1), kubeRecord.SummariesGenerated)
require.NoError(t, svc.deleteIdentitySecuritySummariesGeneratedReport(ctx, reports[0]))
require.Equal(t, types.OpDelete, recvBackendEvent().Type)
proto/prehog/v1/teleport.proto
+3
View File
@@ -344,6 +344,9 @@ message SessionSummariesGeneratedRecord {
// total_output_tokens is number of total output tokens generated during the summary.
uint64 total_output_tokens = 5;
// number of summaries generated for this session type and resource combination.
uint64 summaries_generated = 6;
}
message SubmitUsageReportsRequest {