Skip to content
This repository was archived by the owner on Mar 11, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,16 @@ class Log implements LogSeverityFunctions {
*/
entry(metadataOrData?: LogEntry | string | {}, data?: string | {}) {
let metadata: LogEntry;
if (!data) {
if (!data && metadataOrData?.hasOwnProperty('httpRequest')) {
// If user logs entry(httpRequest)
metadata = metadataOrData as LogEntry;
data = {};
} else if (!data) {
// If user logs entry(message)
data = metadataOrData as string | {};
metadata = {};
} else {
// If user logs entry(metadata, message)
metadata = metadataOrData as LogEntry;
}
return this.logging.entry(metadata, data);
Expand Down
24 changes: 24 additions & 0 deletions system-test/logging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,30 @@ describe('Logging', () => {
});
});

it('should write a httpRequest log with no message', done => {
const {log} = getTestLog();
const metadata = {
httpRequest: {status: 200},
};
const logEntry = log.entry(metadata);

log.write(logEntry, err => {
assert.ifError(err);

getEntriesFromLog(log, {numExpectedMessages: 1}, (err, entries) => {
assert.ifError(err);
const entry = entries![0];

assert.strictEqual(
entry.metadata.httpRequest?.status,
metadata.httpRequest.status
);
assert.deepStrictEqual(entry.data, {});
done();
});
});
});

it('should set the default resource', done => {
const {log} = getTestLog();

Expand Down
10 changes: 9 additions & 1 deletion test/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,19 @@ describe('Log', () => {
assert(log.logging.entry.calledWithExactly(metadata, data));
});

it('should assume one argument means data', () => {
it('should assume one regular argument means data', () => {
const data = {};
log.entry(data);
assert(log.logging.entry.calledWith(sinon.match.any, data));
});

it('should assume one httpRequest argument means metadata', () => {
const metadata = {
httpRequest: {},
};
log.entry(metadata);
assert(log.logging.entry.calledWith(metadata, {}));
});
});

describe('getEntries', () => {
Expand Down