@openobserve/browser-core 0.2.12-beta.21 → 0.2.12-beta.23

package/src/boot/displayAlreadyInitializedError.ts

@@ -1,7 +1,7 @@
 import type { InitConfiguration } from '../domain/configuration'
 import { display } from '../tools/display'
 
-export function displayAlreadyInitializedError(sdkName: 'DD_RUM' | 'DD_LOGS', initConfiguration: InitConfiguration) {
+export function displayAlreadyInitializedError(sdkName: 'OO_RUM' | 'OO_LOGS', initConfiguration: InitConfiguration) {
   if (!initConfiguration.silentMultipleInit) {
     display.error(`${sdkName} is already initialized.`)
   }

package/src/boot/init.ts

@@ -12,7 +12,7 @@ export interface PublicApi {
   version: string
 
   /**
-   * For CDN async setup: Early RUM API calls must be wrapped in the `window.DD_RUM.onReady()` callback. This ensures the code only gets executed once the SDK is properly loaded.
+   * For CDN async setup: Early RUM API calls must be wrapped in the `window.OO_RUM.onReady()` callback. This ensures the code only gets executed once the SDK is properly loaded.
    *
    * See [CDN async setup](https://docs.datadoghq.com/real_user_monitoring/browser/#cdn-async) for further information.
    */

package/src/browser/addEventListener.ts

@@ -2,7 +2,7 @@ import { monitor } from '../tools/monitor'
 import { getZoneJsOriginalValue } from '../tools/getZoneJsOriginalValue'
 import type { CookieStore, CookieStoreEventMap, VisualViewport, VisualViewportEventMap } from './browser.types'
 
-export type TrustableEvent<E extends Event = Event> = E & { __ddIsTrusted?: boolean }
+export type TrustableEvent<E extends Event = Event> = E & { __ooIsTrusted?: boolean }
 
 export const enum DOM_EVENT {
   BEFORE_UNLOAD = 'beforeunload',
@@ -116,7 +116,7 @@ export function addEventListeners<Target extends EventTarget, EventName extends
   { once, capture, passive }: AddEventListenerOptions = {}
 ) {
   const listenerWithMonitor = monitor((event: TrustableEvent) => {
-    if (!event.isTrusted && !event.__ddIsTrusted && !configuration.allowUntrustedEvents) {
+    if (!event.isTrusted && !event.__ooIsTrusted && !configuration.allowUntrustedEvents) {
       return
     }
     if (once) {

package/src/domain/configuration/configuration.ts

@@ -348,11 +348,12 @@ function isString(tag: unknown, tagName: string): tag is string | undefined | nu
 }
 
 function isDatadogSite(site: unknown) {
-  if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
-    display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
-    return false
-  }
-  return true
+  return true;
+  // if (site && typeof site === 'string' && !/(datadog|ddog|datad0g|dd0g)/.test(site)) {
+  //   display.error(`Site should be a valid Datadog site. ${MORE_DETAILS} ${DOCS_ORIGIN}/getting_started/site/.`)
+  //   return false
+  // }
+  // return true
 }
 
 export function isSampleRate(sampleRate: unknown, name: string) {

package/src/domain/configuration/endpointBuilder.ts

@@ -44,11 +44,15 @@ function createEndpointUrlWithParametersBuilder(
   initConfiguration: InitConfiguration,
   trackType: TrackType
 ): (parameters: string) => string {
-  const { proxy, proxyUrl, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration
-
-  const path = `/rum/${apiVersion}/${organizationIdentifier}/${INTAKE_TRACKS[trackType]}`
-
-  if (proxy) {
+  // const path = `/api/v2/${trackType}`
+  const { proxy, apiVersion, organizationIdentifier, insecureHTTP } = initConfiguration
+
+  console.log('apiVersion', apiVersion)
+  console.log('organizationIdentifier', organizationIdentifier)
+  console.log('insecureHTTP', insecureHTTP)
+  const path = `/rum/${apiVersion}/${organizationIdentifier}/${trackType}`
+  console.log('path', path)
+  if (typeof proxy === 'string') {
     const normalizedProxyUrl = normalizeUrl(proxy)
     return (parameters) => `${normalizedProxyUrl}?ooforward=${encodeURIComponent(`${path}?${parameters}`)}`
   }
@@ -56,7 +60,8 @@ function createEndpointUrlWithParametersBuilder(
     return (parameters) => proxy({ path, parameters })
   }
   const host = buildEndpointHost(trackType, initConfiguration)
-  return (parameters) => `https://${host}${path}?${parameters}`
+  const protocol = insecureHTTP ? 'http' : 'https'
+  return (parameters) => `${protocol}://${host}${path}?${parameters}`
 }
 
 export function buildEndpointHost(
@@ -66,6 +71,11 @@ export function buildEndpointHost(
   const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration
 
   return site
+
+  if (trackType === 'logs' && initConfiguration.usePciIntake && site === INTAKE_SITE_US1) {
+    return PCI_INTAKE_HOST_US1
+  }
+
   if (internalAnalyticsSubdomain && site === INTAKE_SITE_US1) {
     return `${internalAnalyticsSubdomain}.${INTAKE_SITE_US1}`
   }
@@ -91,22 +101,22 @@ function buildEndpointParameters(
   extraParameters: string[] = []
 ) {
   const parameters = [
-    'o2source=browser',
-    `o2-api-key=${clientToken}`,
-    `o2-evp-origin-version=${encodeURIComponent(__BUILD_ENV__SDK_VERSION__)}`,
-    'o2-evp-origin=browser',
-    `o2-request-id=${generateUUID()}`,
+    `oosource=${source}`,
+    `oo-api-key=${clientToken}`,
+    `oo-evp-origin-version=${encodeURIComponent(__BUILD_ENV__SDK_VERSION__)}`,
+    'oo-evp-origin=browser',
+    `oo-request-id=${generateUUID()}`,
   ].concat(extraParameters)
 
   if (encoding) {
-    parameters.push(`dd-evp-encoding=${encoding}`)
+    parameters.push(`oo-evp-encoding=${encoding}`)
   }
 
   if (trackType === 'rum') {
-    parameters.push(`batch_time=${timeStampNow()}`, `_dd.api=${api}`)
+    parameters.push(`batch_time=${timeStampNow()}`, `_oo.api=${api}`)
 
     if (retry) {
-      parameters.push(`_dd.retry_count=${retry.count}`, `_dd.retry_after=${retry.lastFailureStatus}`)
+      parameters.push(`_oo.retry_count=${retry.count}`, `_oo.retry_after=${retry.lastFailureStatus}`)
     }
   }
 
@@ -115,4 +125,4 @@ function buildEndpointParameters(
   }
 
   return parameters.join('&')
-}
+}

package/src/domain/context/storeContextManager.ts

@@ -6,7 +6,7 @@ import { isEmptyObject } from '../../tools/utils/objectUtils'
 import type { ContextManager } from './contextManager'
 import type { CustomerDataType } from './contextConstants'
 
-const CONTEXT_STORE_KEY_PREFIX = '_dd_c'
+const CONTEXT_STORE_KEY_PREFIX = '_oo_c'
 
 const storageListeners: Array<{ stop: () => void }> = []