Revert "Colocate bitdrift in logger, use logger for transport (#7859)"

This reverts commit 1617eb5d66.
This commit is contained in:
Eric Bailey
2025-02-28 12:10:13 -06:00
committed by GitHub
parent 1617eb5d66
commit 7989d32398
9 changed files with 23 additions and 15 deletions
+1 -1
View File
@@ -119,5 +119,5 @@ jest.mock('statsig-react-native-expo', () => ({
},
}))
jest.mock('../src/logger/bitdrift/lib', () => ({}))
jest.mock('../src/lib/bitdrift', () => ({}))
jest.mock('../src/lib/statsig/statsig', () => ({}))
+1 -1
View File
@@ -1,6 +1,6 @@
import 'react-native-url-polyfill/auto'
import '#/logger/sentry/setup'
import '#/logger/bitdrift/setup'
import '#/lib/bitdrift' // must be near top
import '#/view/icons'
import React, {useEffect, useState} from 'react'
@@ -1,7 +1,9 @@
import {init, SessionStrategy} from '@bitdrift/react-native'
import {Statsig} from 'statsig-react-native-expo'
import {initPromise} from '#/lib/statsig/statsig'
import {initPromise} from './statsig/statsig'
export {debug, error, info, warn} from '@bitdrift/react-native'
const BITDRIFT_API_KEY = process.env.BITDRIFT_API_KEY
+6 -1
View File
@@ -4,6 +4,7 @@ import {AppState, AppStateStatus} from 'react-native'
import {Statsig, StatsigProvider} from 'statsig-react-native-expo'
import {BUNDLE_DATE, BUNDLE_IDENTIFIER, IS_TESTFLIGHT} from '#/lib/app-info'
import * as bitdrift from '#/lib/bitdrift'
import {logger} from '#/logger'
import {isWeb} from '#/platform/detection'
import * as persisted from '#/state/persisted'
@@ -101,7 +102,11 @@ export function logEvent<E extends keyof LogEvents>(
if (Statsig.initializeCalled()) {
Statsig.logEvent(eventName, null, fullMetadata)
}
logger.info(eventName, fullMetadata)
// Intentionally bypass the logger abstraction to log rich objects.
console.groupCollapsed(eventName)
console.log(fullMetadata)
console.groupEnd()
bitdrift.info(eventName, fullMetadata)
} catch (e) {
// A log should never interrupt the calling code, whatever happens.
logger.error('Failed to log an event', {message: e})
-1
View File
@@ -1 +0,0 @@
export {debug, error, info, warn} from '@bitdrift/react-native'
+1 -4
View File
@@ -6,14 +6,11 @@ import {consoleTransport} from '#/logger/transports/console'
import {sentryTransport} from '#/logger/transports/sentry'
import {LogContext, LogLevel, Metadata, Transport} from '#/logger/types'
import {enabledLogLevels} from '#/logger/util'
import {isNative} from '#/platform/detection'
const TRANSPORTS: Transport[] = (function configureTransports() {
switch (process.env.NODE_ENV) {
case 'production': {
return [sentryTransport, isNative && bitdriftTransport].filter(
Boolean,
) as Transport[]
return [sentryTransport, bitdriftTransport].filter(Boolean) as Transport[]
}
case 'test': {
return []
+11 -6
View File
@@ -1,13 +1,18 @@
import {debug, error, info, warn} from '#/logger/bitdrift/lib'
import {
debug as bdDebug,
error as bdError,
info as bdInfo,
warn as bdWarn,
} from '#/lib/bitdrift'
import {LogLevel, Transport} from '#/logger/types'
import {prepareMetadata} from '#/logger/util'
const logFunctions = {
[LogLevel.Debug]: debug,
[LogLevel.Info]: info,
[LogLevel.Log]: info,
[LogLevel.Warn]: warn,
[LogLevel.Error]: error,
[LogLevel.Debug]: bdDebug,
[LogLevel.Info]: bdInfo,
[LogLevel.Log]: bdInfo,
[LogLevel.Warn]: bdWarn,
[LogLevel.Error]: bdError,
} as const
export const bitdriftTransport: Transport = (