feat(server): use x-cloud-trace-context instead of x-rpc-trace-id (#10068)
x-cloud-trace-context will be overwritten by lb, and cannot be fake from internet access request 
This commit is contained in:
@@ -57,7 +57,7 @@ export const FunctionalityModules = [
|
|||||||
generateId: true,
|
generateId: true,
|
||||||
idGenerator(req: Request) {
|
idGenerator(req: Request) {
|
||||||
// make every request has a unique id to tracing
|
// make every request has a unique id to tracing
|
||||||
return req.get('x-rpc-trace-id') ?? genRequestId('req');
|
return req.get('x-cloud-trace-context') ?? genRequestId('req');
|
||||||
},
|
},
|
||||||
setup(cls, _req, res: Response) {
|
setup(cls, _req, res: Response) {
|
||||||
res.setHeader('X-Request-Id', cls.getId());
|
res.setHeader('X-Request-Id', cls.getId());
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ test('should return doc when found', async t => {
|
|||||||
const res = await app
|
const res = await app
|
||||||
.GET(`/rpc/workspaces/${workspace.id}/docs/${docId}`)
|
.GET(`/rpc/workspaces/${workspace.id}/docs/${docId}`)
|
||||||
.set('x-access-token', t.context.crypto.sign(docId))
|
.set('x-access-token', t.context.crypto.sign(docId))
|
||||||
.set('x-rpc-trace-id', 'test-trace-id')
|
.set('x-cloud-trace-context', 'test-trace-id')
|
||||||
.expect(200)
|
.expect(200)
|
||||||
.expect('x-request-id', 'test-trace-id')
|
.expect('x-request-id', 'test-trace-id')
|
||||||
.expect('Content-Type', 'application/octet-stream');
|
.expect('Content-Type', 'application/octet-stream');
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export class RpcDocReader extends DatabaseDocReader {
|
|||||||
const res = await fetch(url, {
|
const res = await fetch(url, {
|
||||||
headers: {
|
headers: {
|
||||||
'x-access-token': this.crypto.sign(docId),
|
'x-access-token': this.crypto.sign(docId),
|
||||||
'x-rpc-trace-id': this.cls.getId(),
|
'x-cloud-trace-context': this.cls.getId(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
|
|||||||
Reference in New Issue
Block a user