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

[RUM] enable request with batch time by default #297

Merged
merged 3 commits into from
Mar 12, 2020
Merged

[RUM] enable request with batch time by default #297

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
284f1c5
[RUM] enable request with batch time by default
bcaudan Mar 12, 2020
92bd0cc
:recycle: allow endpoint url without query params
bcaudan Mar 12, 2020
05740b3
:white_check_mark: enable experimental features by default
bcaudan Mar 12, 2020
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
7 changes: 5 additions & 2 deletions packages/core/src/transport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export class HttpRequest {
constructor(private endpointUrl: string, private bytesLimit: number, private withBatchTime: boolean = false) {}

send(data: string, size: number) {
const batchTime = new Date().getTime()
const url = this.withBatchTime ? `${this.endpointUrl}&batch_time=${batchTime}` : this.endpointUrl
const url = this.withBatchTime ? addBatchTime(this.endpointUrl) : this.endpointUrl
if (navigator.sendBeacon && size < this.bytesLimit) {
const isQueued = navigator.sendBeacon(url, data)
if (isQueued) {
Expand All @@ -29,6 +28,10 @@ export class HttpRequest {
}
}

function addBatchTime(url: string) {
return `${url}${url.indexOf('?') === -1 ? '?' : '&'}batch_time=${new Date().getTime()}`
}

export class Batch<T> {
private beforeFlushOnUnloadHandlers: Array<() => void> = []
private pushOnlyBuffer: string[] = []
Expand Down
2 changes: 1 addition & 1 deletion packages/rum/src/rum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function startRumBatch(
globalContextProvider: () => Context
) {
const batch = new Batch<Context>(
new HttpRequest(configuration.rumEndpoint, configuration.batchBytesLimit, configuration.enableExperimentalFeatures),
new HttpRequest(configuration.rumEndpoint, configuration.batchBytesLimit, true),
configuration.maxBatchSize,
configuration.batchBytesLimit,
configuration.maxMessageSize,
Expand Down
2 changes: 2 additions & 0 deletions test/app/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const intakeOrigin = `http://${hostname}:4000`

datadogLogs.init({
clientToken: 'key',
enableExperimentalFeatures: true,
forwardErrorsToLogs: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
Expand All @@ -16,6 +17,7 @@ datadogLogs.init({
datadogRum.init({
applicationId: 'rum',
clientToken: 'key',
enableExperimentalFeatures: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
rumEndpoint: `${intakeOrigin}/rum`,
Expand Down
2 changes: 2 additions & 0 deletions test/static/async-e2e-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
window.DD_LOGS &&
window.DD_LOGS.init({
clientToken: 'key',
enableExperimentalFeatures: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
rumEndpoint: `${intakeOrigin}/rum`,
Expand All @@ -32,6 +33,7 @@
window.DD_RUM.init({
applicationId: 'rum',
clientToken: 'key',
enableExperimentalFeatures: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
rumEndpoint: `${intakeOrigin}/rum`,
Expand Down
2 changes: 2 additions & 0 deletions test/static/bundle-e2e-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
window.DD_LOGS &&
window.DD_LOGS.init({
clientToken: 'key',
enableExperimentalFeatures: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
rumEndpoint: `${intakeOrigin}/rum`,
Expand All @@ -23,6 +24,7 @@
window.DD_RUM.init({
applicationId: 'rum',
clientToken: 'key',
enableExperimentalFeatures: true,
internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
logsEndpoint: `${intakeOrigin}/logs`,
rumEndpoint: `${intakeOrigin}/rum`,
Expand Down