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
2 changes: 1 addition & 1 deletion benchmarks/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,5 @@ dependencies {

// Benchmark tools from dd-sdk-android are used for vitals recording
// Remember to bump thid alongside the main dd-sdk-android dependencies
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.3.0")
implementation("com.datadoghq:dd-sdk-android-benchmark-internal:3.4.0")
}
11 changes: 8 additions & 3 deletions benchmarks/src/scenario/RUM/Auto/rumAutoScenario.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useNavigationContainerRef } from '@react-navigation/native';
import { DatadogProvider } from "@datadog/mobile-react-native";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { NavigationContainer } from "@react-navigation/native";
import { DdRumReactNavigationTracking, type ViewNamePredicate } from '@datadog/mobile-react-navigation';
import { DdRumReactNavigationTracking, type NavigationTrackingOptions, type ViewNamePredicate } from '@datadog/mobile-react-navigation';
import type { Route } from "@react-navigation/native";
import { RunType } from '../../../testSetup/types/testConfig';
import { getDatadogProviderConfig } from '../../../testSetup/testUtils';
Expand All @@ -31,12 +31,17 @@ function RUMAutoScenario(props: RUMAutoScenarioProps): React.JSX.Element {
return `RN ${Platform.OS} Benchmark - RUM Auto - ${trackedName} / ${route.name}`;
};

const navigationTrackingOptions: NavigationTrackingOptions = {
viewNamePredicate,
};

const onDatadogInitialization = () => {
console.info("Datadog SDK initialized");
};

const Tab = createBottomTabNavigator();
const RootStack = createNativeStackNavigator<RootStackParamList>();


function TabNavigatior() {
return (
Expand All @@ -60,7 +65,7 @@ function RUMAutoScenario(props: RUMAutoScenarioProps): React.JSX.Element {
return (
<NavigationContainer ref={navigationRef} onReady={() => {
if (instrumented) {
DdRumReactNavigationTracking.startTrackingViews(navigationRef.current, viewNamePredicate);
DdRumReactNavigationTracking.startTrackingViews(navigationRef.current, navigationTrackingOptions);
};
}}>
<RootStack.Navigator>
Expand Down Expand Up @@ -88,4 +93,4 @@ function RUMAutoScenario(props: RUMAutoScenarioProps): React.JSX.Element {
};
}

export default RUMAutoScenario;
export default RUMAutoScenario;
8 changes: 4 additions & 4 deletions packages/core/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ dependencies {
}
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly "com.squareup.okhttp3:okhttp:3.12.13"
implementation "com.datadoghq:dd-sdk-android-rum:3.3.0"
implementation "com.datadoghq:dd-sdk-android-logs:3.3.0"
implementation "com.datadoghq:dd-sdk-android-trace:3.3.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.3.0"
implementation "com.datadoghq:dd-sdk-android-rum:3.4.0"
implementation "com.datadoghq:dd-sdk-android-logs:3.4.0"
implementation "com.datadoghq:dd-sdk-android-trace:3.4.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.4.0"
implementation "com.google.code.gson:gson:2.10.0"
testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-session-replay/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ dependencies {
api "com.facebook.react:react-android:$reactNativeVersion"
}
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.datadoghq:dd-sdk-android-session-replay:3.3.0"
implementation "com.datadoghq:dd-sdk-android-internal:3.3.0"
implementation "com.datadoghq:dd-sdk-android-session-replay:3.4.0"
implementation "com.datadoghq:dd-sdk-android-internal:3.4.0"
implementation project(path: ':datadog_mobile-react-native')

testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-webview/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ dependencies {
implementation "com.facebook.react:react-android:$reactNativeVersion"
}

implementation "com.datadoghq:dd-sdk-android-webview:3.3.0"
implementation "com.datadoghq:dd-sdk-android-webview:3.4.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

implementation project(path: ':datadog_mobile-react-native')
Expand Down