diff --git a/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp b/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp index ac9c8c84362..5cf5e443827 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp @@ -7,6 +7,7 @@ #include "ConsoleTask.h" #include "ConsoleTaskContext.h" +#include "ConsoleTaskOrchestrator.h" #include #include @@ -480,8 +481,17 @@ void consoleTimeStamp( } if (performanceTracer.isTracing()) { + auto taskContext = ConsoleTaskOrchestrator::getInstance().top(); + performanceTracer.reportTimeStamp( - label, start, end, trackName, trackGroup, color, std::move(detail)); + label, + start, + end, + trackName, + trackGroup, + color, + std::move(detail), + taskContext ? taskContext->getSerializedStackTraceProvider() : nullptr); } if (ReactPerfettoLogger::isTracing()) { diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp index d596decb121..c8206324b5d 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp @@ -214,7 +214,8 @@ void PerformanceTracer::reportTimeStamp( std::optional trackName, std::optional trackGroup, std::optional color, - std::optional detail) { + std::optional detail, + std::function()>&& stackTraceProvider) { if (!tracingAtomic_) { return; } @@ -233,6 +234,7 @@ void PerformanceTracer::reportTimeStamp( .trackGroup = std::move(trackGroup), .color = std::move(color), .detail = std::move(detail), + .stackTraceProvider = std::move(stackTraceProvider), .threadId = getCurrentThreadId(), }); } @@ -695,6 +697,11 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent( } data["devtools"] = folly::toJson(devtoolsDetail); } + if (event.stackTraceProvider) { + if (auto maybeStackTrace = event.stackTraceProvider()) { + data["rnStackTrace"] = std::move(*maybeStackTrace); + } + } events.emplace_back( TraceEvent{ diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h index f763cc8597b..0e4f3964dc0 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h @@ -97,7 +97,8 @@ class PerformanceTracer { std::optional trackName = std::nullopt, std::optional trackGroup = std::nullopt, std::optional color = std::nullopt, - std::optional detail = std::nullopt); + std::optional detail = std::nullopt, + std::function()> &&stackTraceProvider = nullptr); /** * Record an Event Loop tick, which will be represented as an Event Loop task @@ -267,6 +268,7 @@ class PerformanceTracer { std::optional trackGroup; std::optional color; std::optional detail; + std::function()> stackTraceProvider; ThreadId threadId; HighResTimeStamp createdAt = HighResTimeStamp::now(); };