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

* [RUM] enable request with batch time by default * ♻️ allow endpoint url without query params * ✅ enable experimental features by default
DataDog · Mar 12, 2020 · f8ff8fb · f8ff8fb
1 parent 6744714
commit f8ff8fb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/packages/core/src/transport.ts b/packages/core/src/transport.ts
@@ -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) {
@@ -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[] = []

diff --git a/packages/rum/src/rum.ts b/packages/rum/src/rum.ts
@@ -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,

diff --git a/test/app/app.ts b/test/app/app.ts
@@ -7,6 +7,7 @@ const intakeOrigin = `http://${hostname}:4000`
 
 datadogLogs.init({
   clientToken: 'key',
+  enableExperimentalFeatures: true,
   forwardErrorsToLogs: true,
   internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
   logsEndpoint: `${intakeOrigin}/logs`,
@@ -16,6 +17,7 @@ datadogLogs.init({
 datadogRum.init({
   applicationId: 'rum',
   clientToken: 'key',
+  enableExperimentalFeatures: true,
   internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
   logsEndpoint: `${intakeOrigin}/logs`,
   rumEndpoint: `${intakeOrigin}/rum`,

diff --git a/test/static/async-e2e-page.html b/test/static/async-e2e-page.html
@@ -17,6 +17,7 @@
           window.DD_LOGS &&
             window.DD_LOGS.init({
               clientToken: 'key',
+              enableExperimentalFeatures: true,
               internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
               logsEndpoint: `${intakeOrigin}/logs`,
               rumEndpoint: `${intakeOrigin}/rum`,
@@ -32,6 +33,7 @@
             window.DD_RUM.init({
               applicationId: 'rum',
               clientToken: 'key',
+              enableExperimentalFeatures: true,
               internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
               logsEndpoint: `${intakeOrigin}/logs`,
               rumEndpoint: `${intakeOrigin}/rum`,

diff --git a/test/static/bundle-e2e-page.html b/test/static/bundle-e2e-page.html
@@ -11,6 +11,7 @@
       window.DD_LOGS &&
         window.DD_LOGS.init({
           clientToken: 'key',
+          enableExperimentalFeatures: true,
           internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
           logsEndpoint: `${intakeOrigin}/logs`,
           rumEndpoint: `${intakeOrigin}/rum`,
@@ -23,6 +24,7 @@
         window.DD_RUM.init({
           applicationId: 'rum',
           clientToken: 'key',
+          enableExperimentalFeatures: true,
           internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
           logsEndpoint: `${intakeOrigin}/logs`,
           rumEndpoint: `${intakeOrigin}/rum`,