Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import android.content.Context
import android.util.Log
import com.datadog.android.Datadog
import com.datadog.android._InternalProxy
import com.datadog.android.api.InternalLogger
import com.datadog.android.api.SdkCore
import com.datadog.android.api.feature.FeatureSdkCore
import com.datadog.android.core.InternalSdkCore
import com.datadog.android.core.configuration.Configuration
import com.datadog.android.log.Logs
Expand All @@ -23,6 +25,7 @@ import com.datadog.android.rum.RumMonitor
import com.datadog.android.trace.Trace
import com.datadog.android.trace.TraceConfiguration
import com.datadog.android.webview.WebViewTracking
import com.facebook.react.bridge.ReadableMap

/**
* Internal object used to add internal testing.
Expand Down Expand Up @@ -157,6 +160,22 @@ internal class DatadogSDKWrapper : DatadogWrapper {
Datadog.setTrackingConsent(trackingConsent)
}

override fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap) {
val core = DatadogSDKWrapperStorage.getSdkCore() as FeatureSdkCore?
val logger = core?.internalLogger;

val additionalProperties = attributes.toMap()
val telemetryConfig = config.toMap()

logger?.log(
level = InternalLogger.Level.INFO,
target = InternalLogger.Target.TELEMETRY,
messageBuilder = { message },
onlyOnce = (telemetryConfig["onlyOnce"] as? Boolean) ?: true,
additionalProperties = additionalProperties
)
}

override fun telemetryDebug(message: String) {
telemetryProxy?.debug(message)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import com.datadog.android.privacy.TrackingConsent
import com.datadog.android.rum.RumConfiguration
import com.datadog.android.rum.RumMonitor
import com.datadog.android.trace.TraceConfiguration
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReadableMap
import java.lang.IllegalArgumentException

/**
Expand Down Expand Up @@ -142,6 +144,12 @@ interface DatadogWrapper {
*/
fun setTrackingConsent(trackingConsent: TrackingConsent)


/**
* Sends telemetry event with attributes.
*/
fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap)

/**
* Sends telemetry debug event.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicBoolean

/** The entry point to initialize Datadog's features. */
@Suppress("TooManyFunctions")
class DdSdkImplementation(
private val reactContext: ReactApplicationContext,
private val datadog: DatadogWrapper = DatadogSDKWrapper(),
Expand Down Expand Up @@ -60,7 +61,6 @@ class DdSdkImplementation(
configureSynthetics()

initialized.set(true)

promise.resolve(null)
}

Expand Down Expand Up @@ -138,6 +138,17 @@ class DdSdkImplementation(
promise.resolve(null)
}


/**
* Convert React Native's ReadableMap to Map.
* @param attributes Custom attributes we want to send along with the Telemetry Log
* @param config Configuration object, can take 'onlyOnce: Boolean'
*/
fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap, promise: Promise) {
datadog.sendTelemetryLog(message, attributes, config)
promise.resolve(null)
}

/**
* Sends a telemetry debug event.
* @param message Debug message.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ class DdSdk(
implementation.setTrackingConsent(trackingConsent, promise)
}

/**
* Sends a telemetry event with attributes.
* @param message message.
* @param attributes telemetry attributes.
* @param config telemetry configuration.
*/
@ReactMethod
override fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap, promise: Promise) {
implementation.sendTelemetryLog(message, attributes, config, promise)
}

/**
* Sends a telemetry debug event.
* @param message Debug message.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,22 @@ class DdSdk(
implementation.setTrackingConsent(trackingConsent, promise)
}

/**
* Sends a telemetry event with attributes.
* @param message message.
* @param attributes telemetry attributes.
* @param config telemetry configuration.
*/
@ReactMethod
fun sendTelemetryLog(
message: String,
attributes: ReadableMap,
config: ReadableMap,
promise: Promise
) {
implementation.sendTelemetryLog(message, attributes, config, promise)
}

/**
* Sends a telemetry debug event.
* @param message Debug message.
Expand Down
11 changes: 10 additions & 1 deletion packages/core/ios/Sources/DatadogSDKWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,17 @@ public class DatadogSDKWrapper {

return DatadogLogs.Logger.create(with: loggerConfiguration, in: core)
}

// Telemetry
internal func sendTelemetryLog(message: String, attributes: [String: any Encodable], config: [String: any Encodable]) {
if let core = coreInstance {
let id = (config["onlyOnce"] as? Bool) == true ? message : UUID().uuidString
core.telemetry.debug(id: id, message: message, attributes: attributes)
} else {
consolePrint("Core instance was not found when calling sendTelemetryLog.", .warn)
}
}

internal func telemetryDebug(id: String, message: String) {
return Datadog._internal.telemetry.debug(id: id, message: message)
}
Expand Down
4 changes: 4 additions & 0 deletions packages/core/ios/Sources/DdSdk.mm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ -(void)addUserExtraInfo:(NSDictionary *)extraInfo resolve:(RCTPromiseResolveBloc
[self.ddSdkImplementation addUserExtraInfoWithExtraInfo:extraInfo resolve:resolve reject:reject];
}

- (void)sendTelemetryLog:(NSString *)message attributes:(NSDictionary *)attributes config:(NSDictionary *)config resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
[self.ddSdkImplementation sendTelemetryLogWithMessage:message attributes:attributes config:config resolve:resolve reject:reject];
}

- (void)telemetryDebug:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
[self.ddSdkImplementation telemetryDebugWithMessage:message resolve:resolve reject:reject];
}
Expand Down
9 changes: 9 additions & 0 deletions packages/core/ios/Sources/DdSdkImplementation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@ public class DdSdkImplementation: NSObject {
resolve(nil)
}


@objc
public func sendTelemetryLog(message: NSString, attributes: NSDictionary, config: NSDictionary, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
let castedAttributes = castAttributesToSwift(attributes)
let castedConfig = castAttributesToSwift(config)
DatadogSDKWrapper.shared.sendTelemetryLog(message: message as String, attributes: castedAttributes, config: castedConfig)
resolve(nil)
}

@objc
public func telemetryDebug(message: NSString, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
DatadogSDKWrapper.shared.telemetryDebug(id: "datadog_react_native:\(message)", message: message as String)
Expand Down
11 changes: 11 additions & 0 deletions packages/core/src/specs/NativeDdSdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@ export interface Spec extends TurboModule {
*/
setTrackingConsent(trackingConsent: string): Promise<void>;

/**
* Sends internal telemetry message with attributes
* @param message message
* @param attributes attributes
*/
sendTelemetryLog(
message: string,
attributes: Object,
config: Object
): Promise<void>;

/**
* Sends internal telemetry debug message
* @param message debug message
Expand Down
Loading