Unverified Commit 0b762433 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Revert "feat(next/swc): setup native next-swc crash reporter" (#38170)

Revert "feat(next/swc): setup native next-swc crash reporter (#38076)"

This reverts commit 42e33655.
parent da84abc5
This diff is collapsed.
...@@ -44,9 +44,6 @@ tracing-subscriber = "0.3.9" ...@@ -44,9 +44,6 @@ tracing-subscriber = "0.3.9"
tracing-chrome = "0.5.0" tracing-chrome = "0.5.0"
wasmer = { version = "2.3.0", optional = true, default-features = false } wasmer = { version = "2.3.0", optional = true, default-features = false }
wasmer-wasi = { version = "2.3.0", optional = true, default-features = false } wasmer-wasi = { version = "2.3.0", optional = true, default-features = false }
sentry = "0.27.0"
[build-dependencies] [build-dependencies]
napi-build = "1" napi-build = "1"
serde = "1"
serde_json = "1"
\ No newline at end of file
...@@ -8,8 +8,6 @@ use std::{ ...@@ -8,8 +8,6 @@ use std::{
extern crate napi_build; extern crate napi_build;
fn main() { fn main() {
// Emit current platform's target-triple into a text file to create static const
// in util.rs
let out_dir = env::var("OUT_DIR").expect("Outdir should exist"); let out_dir = env::var("OUT_DIR").expect("Outdir should exist");
let dest_path = Path::new(&out_dir).join("triple.txt"); let dest_path = Path::new(&out_dir).join("triple.txt");
let mut f = let mut f =
...@@ -21,22 +19,5 @@ fn main() { ...@@ -21,22 +19,5 @@ fn main() {
) )
.expect("Failed to write target triple text"); .expect("Failed to write target triple text");
// Emit current package.json's version field into a text file to create static
// const in util.rs This is being used to set correct release version for
// the sentry's crash reporter.
let pkg_file =
File::open(Path::new("../../package.json")).expect("Should able to open package.json");
let json: serde_json::Value = serde_json::from_reader(pkg_file).unwrap();
let pkg_version_dest_path = Path::new(&out_dir).join("package.txt");
let mut package_version_writer = BufWriter::new(
File::create(&pkg_version_dest_path).expect("Failed to create package version text"),
);
write!(
package_version_writer,
"{}",
json["version"].as_str().unwrap()
)
.expect("Failed to write target triple text");
napi_build::setup(); napi_build::setup();
} }
...@@ -79,9 +79,6 @@ fn init(mut exports: JsObject) -> napi::Result<()> { ...@@ -79,9 +79,6 @@ fn init(mut exports: JsObject) -> napi::Result<()> {
)?; )?;
exports.create_named_method("teardownTraceSubscriber", util::teardown_trace_subscriber)?; exports.create_named_method("teardownTraceSubscriber", util::teardown_trace_subscriber)?;
exports.create_named_method("initCrashReporter", util::init_crash_reporter)?;
exports.create_named_method("teardownCrashReporter", util::teardown_crash_reporter)?;
Ok(()) Ok(())
} }
......
...@@ -28,17 +28,12 @@ DEALINGS IN THE SOFTWARE. ...@@ -28,17 +28,12 @@ DEALINGS IN THE SOFTWARE.
use anyhow::{anyhow, Context, Error}; use anyhow::{anyhow, Context, Error};
use napi::{CallContext, Env, JsBuffer, JsExternal, JsString, JsUndefined, JsUnknown, Status}; use napi::{CallContext, Env, JsBuffer, JsExternal, JsString, JsUndefined, JsUnknown, Status};
use sentry::{types::Dsn, ClientInitGuard, ClientOptions};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use std::{ use std::{any::type_name, cell::RefCell, convert::TryFrom, path::PathBuf};
any::type_name, borrow::Cow, cell::RefCell, convert::TryFrom, env, path::PathBuf, str::FromStr,
};
use tracing_chrome::{ChromeLayerBuilder, FlushGuard}; use tracing_chrome::{ChromeLayerBuilder, FlushGuard};
use tracing_subscriber::{filter, prelude::*, util::SubscriberInitExt, Layer}; use tracing_subscriber::{filter, prelude::*, util::SubscriberInitExt, Layer};
static TARGET_TRIPLE: &str = include_str!(concat!(env!("OUT_DIR"), "/triple.txt")); static TARGET_TRIPLE: &str = include_str!(concat!(env!("OUT_DIR"), "/triple.txt"));
static PACKAGE_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/package.txt"));
#[contextless_function] #[contextless_function]
pub fn get_target_triple(env: Env) -> napi::ContextlessResult<JsString> { pub fn get_target_triple(env: Env) -> napi::ContextlessResult<JsString> {
env.create_string(TARGET_TRIPLE).map(Some) env.create_string(TARGET_TRIPLE).map(Some)
...@@ -149,44 +144,3 @@ pub fn teardown_trace_subscriber(cx: CallContext) -> napi::Result<JsUndefined> { ...@@ -149,44 +144,3 @@ pub fn teardown_trace_subscriber(cx: CallContext) -> napi::Result<JsUndefined> {
} }
cx.env.get_undefined() cx.env.get_undefined()
} }
/// Initialize crash reporter to collect unexpected native next-swc crashes.
#[js_function(1)]
pub fn init_crash_reporter(cx: CallContext) -> napi::Result<JsExternal> {
// Attempts to follow https://nextjs.org/telemetry's debug behavior.
// However, this is techinically not identical to the behavior of the telemetry
// itself as sentry's debug option does not provides full payuload output.
let debug = env::var("NEXT_TELEMETRY_DEBUG").map_or_else(|_| false, |v| v == "1");
let dsn = if debug {
None
} else {
Dsn::from_str("https://7619e5990e3045cda747e50e6ed087a7@o205439.ingest.sentry.io/6528434")
.ok()
};
let guard = sentry::init(ClientOptions {
release: Some(Cow::Borrowed(PACKAGE_VERSION)),
dsn,
debug,
..Default::default()
});
let guard_cell = RefCell::new(Some(guard));
cx.env.create_external(guard_cell, None)
}
/// Trying to drop crash reporter guard if exists. This is the way to hold
/// guards to not to be dropped immediately after crash reporter is initialized
/// in napi context.
#[js_function(1)]
pub fn teardown_crash_reporter(cx: CallContext) -> napi::Result<JsUndefined> {
let guard_external = cx.get::<JsExternal>(0)?;
let guard_cell = &*cx
.env
.get_value_external::<RefCell<Option<ClientInitGuard>>>(&guard_external)?;
if let Some(guard) = guard_cell.take() {
drop(guard);
}
cx.env.get_undefined()
}
...@@ -106,11 +106,7 @@ import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin' ...@@ -106,11 +106,7 @@ import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin'
import { MiddlewareManifest } from './webpack/plugins/middleware-plugin' import { MiddlewareManifest } from './webpack/plugins/middleware-plugin'
import { recursiveCopy } from '../lib/recursive-copy' import { recursiveCopy } from '../lib/recursive-copy'
import { recursiveReadDir } from '../lib/recursive-readdir' import { recursiveReadDir } from '../lib/recursive-readdir'
import { import { lockfilePatchPromise, teardownTraceSubscriber } from './swc'
lockfilePatchPromise,
teardownTraceSubscriber,
teardownCrashReporter,
} from './swc'
import { injectedClientEntries } from './webpack/plugins/client-entry-plugin' import { injectedClientEntries } from './webpack/plugins/client-entry-plugin'
import { getNamedRouteRegex } from '../shared/lib/router/utils/route-regex' import { getNamedRouteRegex } from '../shared/lib/router/utils/route-regex'
import { flatReaddir } from '../lib/flat-readdir' import { flatReaddir } from '../lib/flat-readdir'
...@@ -2330,7 +2326,6 @@ export default async function build( ...@@ -2330,7 +2326,6 @@ export default async function build(
// Ensure all traces are flushed before finishing the command // Ensure all traces are flushed before finishing the command
await flushAllTraces() await flushAllTraces()
teardownTraceSubscriber() teardownTraceSubscriber()
teardownCrashReporter()
} }
} }
......
import createStore from 'next/dist/compiled/unistore' import createStore from 'next/dist/compiled/unistore'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import { flushAllTraces } from '../../trace' import { flushAllTraces } from '../../trace'
import { teardownCrashReporter, teardownTraceSubscriber } from '../swc' import { teardownTraceSubscriber } from '../swc'
import * as Log from './log' import * as Log from './log'
export type OutputState = export type OutputState =
...@@ -92,7 +92,6 @@ store.subscribe((state) => { ...@@ -92,7 +92,6 @@ store.subscribe((state) => {
// Ensure traces are flushed after each compile in development mode // Ensure traces are flushed after each compile in development mode
flushAllTraces() flushAllTraces()
teardownTraceSubscriber() teardownTraceSubscriber()
teardownCrashReporter()
return return
} }
...@@ -120,7 +119,6 @@ store.subscribe((state) => { ...@@ -120,7 +119,6 @@ store.subscribe((state) => {
// Ensure traces are flushed after each compile in development mode // Ensure traces are flushed after each compile in development mode
flushAllTraces() flushAllTraces()
teardownTraceSubscriber() teardownTraceSubscriber()
teardownCrashReporter()
return return
} }
...@@ -137,5 +135,4 @@ store.subscribe((state) => { ...@@ -137,5 +135,4 @@ store.subscribe((state) => {
// Ensure traces are flushed after each compile in development mode // Ensure traces are flushed after each compile in development mode
flushAllTraces() flushAllTraces()
teardownTraceSubscriber() teardownTraceSubscriber()
teardownCrashReporter()
}) })
...@@ -8,5 +8,4 @@ export function parse(src: string, options: any): any ...@@ -8,5 +8,4 @@ export function parse(src: string, options: any): any
export const lockfilePatchPromise: { cur?: Promise<void> } export const lockfilePatchPromise: { cur?: Promise<void> }
export function initCustomTraceSubscriber(traceFileName?: string): void export function initCustomTraceSubscriber(traceFileName?: string): void
export function teardownTraceSubscriber(): void export function teardownTraceSubscriber(): void
export function teardownCrashReporter(): void
export function loadBindings(): Promise<void> export function loadBindings(): Promise<void>
...@@ -8,7 +8,6 @@ import { eventSwcLoadFailure } from '../../telemetry/events/swc-load-failure' ...@@ -8,7 +8,6 @@ import { eventSwcLoadFailure } from '../../telemetry/events/swc-load-failure'
import { patchIncorrectLockfile } from '../../lib/patch-incorrect-lockfile' import { patchIncorrectLockfile } from '../../lib/patch-incorrect-lockfile'
import { downloadWasmSwc } from '../../lib/download-wasm-swc' import { downloadWasmSwc } from '../../lib/download-wasm-swc'
import { version as nextVersion } from 'next/package.json' import { version as nextVersion } from 'next/package.json'
import { Telemetry } from '../../telemetry/storage'
const ArchName = arch() const ArchName = arch()
const PlatformName = platform() const PlatformName = platform()
...@@ -19,7 +18,6 @@ let wasmBindings ...@@ -19,7 +18,6 @@ let wasmBindings
let downloadWasmPromise let downloadWasmPromise
let pendingBindings let pendingBindings
let swcTraceFlushGuard let swcTraceFlushGuard
let swcCrashReporterFlushGuard
export const lockfilePatchPromise = {} export const lockfilePatchPromise = {}
export async function loadBindings() { export async function loadBindings() {
...@@ -217,17 +215,6 @@ function loadNative() { ...@@ -217,17 +215,6 @@ function loadNative() {
} }
if (bindings) { if (bindings) {
// Initialize crash reporter, as earliest as possible from any point of import.
// The first-time import to next-swc is not predicatble in the import tree of next.js, which makes
// we can't rely on explicit manual initialization as similar to trace reporter.
if (!swcCrashReporterFlushGuard) {
// Crash reports in next-swc should be treated in the same way we treat telemetry to opt out.
let telemetry = new Telemetry({ distDir: process.cwd() })
if (telemetry.isEnabled) {
swcCrashReporterFlushGuard = bindings.initCrashReporter?.()
}
}
nativeBindings = { nativeBindings = {
isWasm: false, isWasm: false,
transform(src, options) { transform(src, options) {
...@@ -291,7 +278,6 @@ function loadNative() { ...@@ -291,7 +278,6 @@ function loadNative() {
getTargetTriple: bindings.getTargetTriple, getTargetTriple: bindings.getTargetTriple,
initCustomTraceSubscriber: bindings.initCustomTraceSubscriber, initCustomTraceSubscriber: bindings.initCustomTraceSubscriber,
teardownTraceSubscriber: bindings.teardownTraceSubscriber, teardownTraceSubscriber: bindings.teardownTraceSubscriber,
teardownCrashReporter: bindings.teardownCrashReporter,
} }
return nativeBindings return nativeBindings
} }
...@@ -391,20 +377,3 @@ export const teardownTraceSubscriber = (() => { ...@@ -391,20 +377,3 @@ export const teardownTraceSubscriber = (() => {
} }
} }
})() })()
export const teardownCrashReporter = (() => {
let flushed = false
return () => {
if (!flushed) {
flushed = true
try {
let bindings = loadNative()
if (swcCrashReporterFlushGuard) {
bindings.teardownCrashReporter(swcCrashReporterFlushGuard)
}
} catch (e) {
// Suppress exceptions, this fn allows to fail to load native bindings
}
}
}
})()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment