Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update endpoint to Clearlog #8534

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Update endpoint to Clearlog #8534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38c3658
Update endpoint to Clearlog
zwu52 Sep 25, 2024
843657a
Create four-pillows-fetch.md
zwu52 Sep 25, 2024
aaa1a54
Ran yarn format
zwu52 Sep 25, 2024
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
5 changes: 5 additions & 0 deletions .changeset/four-pillows-fetch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@firebase/messaging': patch
---

The logging endpoint has been updated to ensure proper logging of WebPush entries. This resolves an issue where BigQuery logs were missing WebPush data. The payload structure has also been updated in alignment with the latest logging requirements as specified in go/firelog.
7 changes: 2 additions & 5 deletions packages/messaging/src/helpers/logToFirelog.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ import { MessagingService } from '../messaging-service';
import { Stub } from '../testing/sinon-types';
import { getFakeMessagingService } from '../testing/fakes/messaging-service';

const FIRELOG_ENDPOINT = LogModule._mergeStrings(
'hts/frbslgigp.ogepscmv/ieo/eaylg',
'tp:/ieaeogn-agolai.o/1frlglgc/o'
);
const LOG_ENDPOINT = 'https://play.google.com/log?format=json_proto3';

const FCM_TRANSPORT_KEY = LogModule._mergeStrings(
'AzSCbw63g1R0nCw85jG8',
Expand Down Expand Up @@ -68,7 +65,7 @@ describe('logToFirelog', () => {

// assert
expect(fetchStub).to.be.calledOnceWith(
FIRELOG_ENDPOINT.concat('?key=', FCM_TRANSPORT_KEY),
LOG_ENDPOINT.concat('&key=', FCM_TRANSPORT_KEY),
{
method: 'POST',
body: JSON.stringify(LogModule._createLogRequest([getFakeLogEvent()]))
Expand Down
11 changes: 5 additions & 6 deletions packages/messaging/src/helpers/logToFirelog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ import {
import { MessagePayloadInternal } from '../interfaces/internal-message-payload';
import { MessagingService } from '../messaging-service';

const FIRELOG_ENDPOINT = _mergeStrings(
'hts/frbslgigp.ogepscmv/ieo/eaylg',
'tp:/ieaeogn-agolai.o/1frlglgc/o'
);
const LOG_ENDPOINT = 'https://play.google.com/log?format=json_proto3';

const FCM_TRANSPORT_KEY = _mergeStrings(
'AzSCbw63g1R0nCw85jG8',
Expand Down Expand Up @@ -97,7 +94,7 @@ export async function _dispatchLogEvents(
do {
try {
response = await fetch(
FIRELOG_ENDPOINT.concat('?key=', FCM_TRANSPORT_KEY),
LOG_ENDPOINT.concat('&key=', FCM_TRANSPORT_KEY),
{
method: 'POST',
body: JSON.stringify(logRequest)
Expand Down Expand Up @@ -216,7 +213,9 @@ function createAndEnqueueLogEvent(

/* eslint-disable camelcase */
logEvent.event_time_ms = Math.floor(Date.now()).toString();
logEvent.source_extension_json_proto3 = JSON.stringify(fcmEvent);
logEvent.source_extension_json_proto3 = JSON.stringify({
messaging_client_event: fcmEvent
});

if (!!productId) {
logEvent.compliance_data = buildComplianceData(productId);
Expand Down
Loading