Skip to content

[FIX] Missing events in Expo caused by wrong singleton usage #1156

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

Merged
marco-saia-datadog merged 1 commit into from
Feb 23, 2026
Merged

[FIX] Missing events in Expo caused by wrong singleton usage #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions packages/core/src/InternalLog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,33 @@
*/

import { SdkVerbosity } from './config/types/SdkVerbosity';
import { getGlobalInstance } from './utils/singletonUtils';

export const DATADOG_MESSAGE_PREFIX = 'DATADOG:';

const INTERNAL_LOG_MODULE = 'com.datadog.reactnative.internal_log';

/**
* /!\ DO NOT USE THIS IN YOUR APP /!\\
*
* This logger is only for debugging the Datadog SDK.
*/
export class InternalLog {
private static levelMap = new Map<SdkVerbosity, number>([
class _InternalLog {
private levelMap = new Map<SdkVerbosity, number>([
[SdkVerbosity.DEBUG, 1],
[SdkVerbosity.INFO, 2],
[SdkVerbosity.WARN, 3],
[SdkVerbosity.ERROR, 4]
]);

public static verbosity: SdkVerbosity | undefined = undefined;
public verbosity: SdkVerbosity | undefined = undefined;

public static log(message: string, verbosity: SdkVerbosity): void {
if (InternalLog.verbosity === undefined) {
public log(message: string, verbosity: SdkVerbosity): void {
if (this.verbosity === undefined) {
return;
}
const requiredLevel = InternalLog.levelMap.get(verbosity);
const allowedLevel = InternalLog.levelMap.get(InternalLog.verbosity);
const allowedLevel = InternalLog.levelMap.get(this.verbosity);
if (allowedLevel === undefined || requiredLevel === undefined) {
return;
}
Expand All @@ -50,3 +53,8 @@ export class InternalLog {
}
}
}

export const InternalLog = getGlobalInstance(
INTERNAL_LOG_MODULE,
() => new _InternalLog()
);
23 changes: 16 additions & 7 deletions packages/core/src/sdk/DatadogProvider/Buffer/BufferSingleton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,32 @@
* Copyright 2016-Present Datadog, Inc.
*/

import { getGlobalInstance } from '../../../utils/singletonUtils';

import { BoundedBuffer } from './BoundedBuffer';
import type { DatadogBuffer } from './DatadogBuffer';
import { PassThroughBuffer } from './PassThroughBuffer';

export class BufferSingleton {
private static bufferInstance: DatadogBuffer = new BoundedBuffer();
const BUFFER_SINGLETON_MODULE = 'com.datadog.reactnative.buffer_singleton';

class _BufferSingleton {
private bufferInstance: DatadogBuffer = new BoundedBuffer();

static getInstance = (): DatadogBuffer => {
getInstance = (): DatadogBuffer => {
return BufferSingleton.bufferInstance;
};

static onInitialization = () => {
BufferSingleton.bufferInstance.drain();
BufferSingleton.bufferInstance = new PassThroughBuffer();
onInitialization = () => {
this.bufferInstance.drain();
this.bufferInstance = new PassThroughBuffer();
};

static reset = () => {
reset = () => {
BufferSingleton.bufferInstance = new BoundedBuffer();
};
}

export const BufferSingleton = getGlobalInstance(
BUFFER_SINGLETON_MODULE,
() => new _BufferSingleton()
);
Loading