Commita3ee6af

committed

feat: send log limit exceeded in response, not error

1 parent1f5a6d5 commita3ee6afCopy full SHA for a3ee6af

File tree

+84

-69

lines changed

+84

-69

lines changed

Lines changed: 72 additions & 60 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,9 @@ message BatchCreateLogsRequest {`
`247`	`247`	`repeatedLoglogs=2;`
`248`	`248`	`}`
`249`	`249`
`250`		`-messageBatchCreateLogsResponse {}`
	`250`	`+messageBatchCreateLogsResponse {`
	`251`	`+boollog_limit_exceeded=1;`
	`252`	`+}`
`251`	`253`
`252`	`254`	`serviceAgent {`
`253`	`255`	`rpcGetManifest(GetManifestRequest)returns (Manifest);`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (a LogsAPI) BatchCreateLogs(ctx context.Context, req agentproto.BatchCrea`
`37`	`37`	`returnnil,err`
`38`	`38`	`}`
`39`	`39`	`ifworkspaceAgent.LogsOverflowed {`
`40`		`-returnnil,xerrors.New("workspace agent logs overflowed")`
	`40`	`+return&agentproto.BatchCreateLogsResponse{LogLimitExceeded:true},nil`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`iflen(req.Logs)==0 {`
`@@ -128,7 +128,7 @@ func (a LogsAPI) BatchCreateLogs(ctx context.Context, req agentproto.BatchCrea`
`128`	`128`	`returnnil,xerrors.Errorf("publish workspace update: %w",err)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`		`-returnnil,xerrors.New("workspace agent log limit exceeded")`
	`131`	`+return&agentproto.BatchCreateLogsResponse{LogLimitExceeded:true},nil`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// Publish by the lowest log ID inserted so the log stream will fetch`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,9 @@ func TestBatchCreateLogs(t *testing.T) {`
`215`	`215`	`LogSourceId:logSource.ID[:],`
`216`	`216`	`Logs: []*agentproto.Log{},`
`217`	`217`	`})`
`218`		`-require.Error(t,err)`
`219`		`-require.ErrorContains(t,err,"workspace agent logs overflowed")`
`220`		`-require.Nil(t,resp)`
	`218`	`+require.NoError(t,err)`
	`219`	`+require.NotNil(t,resp)`
	`220`	`+require.True(t,resp.LogLimitExceeded)`
`221`	`221`	`require.False(t,publishWorkspaceUpdateCalled)`
`222`	`222`	`require.False(t,publishWorkspaceAgentLogsUpdateCalled)`
`223`	`223`	`})`
`@@ -419,8 +419,9 @@ func TestBatchCreateLogs(t *testing.T) {`
`419`	`419`	`},`
`420`	`420`	`},`
`421`	`421`	`})`
`422`		`-require.Error(t,err)`
`423`		`-require.Nil(t,resp)`
	`422`	`+require.NoError(t,err)`
	`423`	`+require.NotNil(t,resp)`
	`424`	`+require.True(t,resp.LogLimitExceeded)`
`424`	`425`	`require.True(t,publishWorkspaceUpdateCalled)`
`425`	`426`	`require.False(t,publishWorkspaceAgentLogsUpdateCalled)`
`426`	`427`	`})`

Comments

(0)