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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
with:
package-manager: 'npm'
cache: false
min-node-version: 14
min-node-version: 16
rust: true
only: linux-arm64,linux-x64,linuxmusl-arm64,linuxmusl-x64
only: darwin-arm64,darwin-x64,linux-arm64,linux-x64

package-size:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
cache: false
min-node-version: 14
rust: true
only: linux-arm64,linux-x64,linuxmusl-arm64,linuxmusl-x64
only: darwin-arm64,darwin-x64,linux-arm64,linux-x64

publish:
runs-on: ubuntu-latest
Expand All @@ -31,6 +31,7 @@ jobs:
- uses: actions/setup-node@v4
with:
registry-url: 'https://registry.npmjs.org'
- run: chmod -R +x ./prebuilds
- run: npm publish
- id: pkg
run: |
Expand Down
55 changes: 41 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/crashtracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ path = "src/bin/receiver.rs"
anyhow = "1"
datadog-crashtracker = { git = "https://github.com/DataDog/libdatadog.git", branch = "main" }
napi = { version = "2", features = ["serde-json"] }
napi-derive = { version = "2" }
napi-derive = { version = "2", default-features = false }
rustls = { version = "*", default-features = false, features = ["aws-lc-rs"] }
2 changes: 2 additions & 0 deletions crates/crashtracker/src/bin/receiver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ fn main() {}

#[cfg(unix)]
fn main() -> anyhow::Result<()> {
// TODO: remove this line when the receiver default provider is fixed
rustls::crypto::aws_lc_rs::default_provider().install_default().unwrap();
datadog_crashtracker::receiver_entry_point_stdin()
}
27 changes: 1 addition & 26 deletions crates/crashtracker/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
use datadog_crashtracker::CrashtrackerReceiverConfig;
use napi::{Env, JsUnknown};
use napi_derive::napi;
use std::{env::temp_dir, fs, path::{self}};

#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;

#[napi]
pub fn init_with_receiver(env: Env, config: JsUnknown, receiver_config: JsUnknown, metadata: JsUnknown) -> napi::Result<()> {
let config = env.from_js_value(config)?;
let mut receiver_config = env.from_js_value(receiver_config)?;
let receiver_config = env.from_js_value(receiver_config)?;
let metadata = env.from_js_value(metadata)?;

copy_receiver(&mut receiver_config).unwrap();

datadog_crashtracker::init_with_receiver(config, receiver_config, metadata).unwrap();

Ok(())
Expand All @@ -36,21 +29,3 @@ pub fn update_metadata (env: Env, metadata: JsUnknown) -> napi::Result<()> {

Ok(())
}

pub fn copy_receiver (receiver_config: &mut CrashtrackerReceiverConfig) -> Result<(), anyhow::Error> {
let parts: Vec<_> = receiver_config.path_to_receiver_binary.rsplit(path::MAIN_SEPARATOR).collect();
let dest = temp_dir().join(parts[0]);

std::fs::copy(&receiver_config.path_to_receiver_binary, &dest)?;

let mut perms = fs::metadata(&dest)?.permissions();

#[cfg(unix)]
perms.set_mode(0o777);

fs::set_permissions(&dest, perms)?;

receiver_config.path_to_receiver_binary = dest.to_string_lossy().to_string();

Ok(())
}
11 changes: 8 additions & 3 deletions load.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@ function find (name, binary = false) {
}

function findFolder (root) {
const folders = readdirSync(path.join(root, 'prebuilds'))
try {
const prebuilds = path.join(root, 'prebuilds')
const folders = readdirSync(prebuilds)

return folders.find(f => f === `${PLATFORM}${LIBC}-${ARCH}`)
|| folders.find(f => f === `${PLATFORM}-${ARCH}`)
return folders.find(f => f === `${PLATFORM}${LIBC}-${ARCH}`)
|| folders.find(f => f === `${PLATFORM}-${ARCH}`)
} catch (e) {
return null
}
}

function findFile (root, name, binary = false) {
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 0 additions & 30 deletions test/crashtracker.js

This file was deleted.

2 changes: 2 additions & 0 deletions test/crashtracker/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
index.d.ts
index.node
Loading