feat: Add --raw flag to send-envelope

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 "You know what they say. Fool me once, strike one, but fool me twice... strike three." — Michael Scott
 
+## Unreleased
+
+### Various fixes & improvements
+
+- feat: Added the `--raw` flag to `send-envelope` to allow sending envelopes without parsing or validation. (#1468)
+
 ## 2.12.0
 
 ### Various fixes & improvements

Cargo.toml

@@ -52,7 +52,7 @@ regex = "1.7.1"
 runas = "0.2.1"
 rust-ini = "0.18.0"
 semver = "1.0.16"
-sentry = { version = "0.29.2", default-features = false, features = [
+sentry = { version = "0.29.3", default-features = false, features = [
   "anyhow",
   "curl",
   "contexts",

src/commands/send_envelope.rs

@@ -26,6 +26,11 @@ pub fn make_command(command: Command) -> Command {
                 .required(true)
                 .help("The path or glob to the file(s) in envelope format to send as envelope(s)."),
         )
+        .arg(
+            Arg::new("raw")
+                .long("raw")
+                .help("Send envelopes without attempting to parse their contents."),
+        )
 }
 
 fn send_raw_envelope(envelope: Envelope, dsn: Dsn) {
@@ -36,6 +41,7 @@ fn send_raw_envelope(envelope: Envelope, dsn: Dsn) {
 pub fn execute(matches: &ArgMatches) -> Result<()> {
     let config = Config::current();
     let dsn = config.get_dsn()?;
+    let raw = matches.is_present("raw");
 
     let path = matches.value_of("path").unwrap();
 
@@ -51,7 +57,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     for path in collected_paths {
         let p = path.as_path();
-        let envelope: Envelope = Envelope::from_path(p)?;
+        let envelope: Envelope = if raw {
+            Envelope::from_path_raw(p)
+        } else {
+            Envelope::from_path(p)
+        }?;
         send_raw_envelope(envelope, dsn.clone());
         println!("Envelope from file {} dispatched", p.display());
     }

tests/integration/_cases/send_envelope/send_envelope-file-log.trycmd

@@ -3,7 +3,7 @@ $ sentry-cli send-envelope tests/integration/_fixtures/envelope.dat --log-level=
 ? success
   DEBUG   [..] sentry-cli version: [VERSION], platform: [..], architecture: [..]
   INFO    [..] sentry-cli was invoked with the following command line: "[CWD]/target/debug/sentry-cli[EXE]" "send-envelope" "tests/integration/_fixtures/envelope.dat" "--log-level=debug"
-  DEBUG   [..] Envelope { event_id: Some(22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c), items: [Event(Event { event_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c, level: Error, fingerprint: ["{{ default }}"], culprit: None, transaction: None, message: None, logentry: None, logger: None, modules: {}, platform: "other", timestamp: [..], server_name: None, release: None, dist: None, environment: None, user: None, request: None, contexts: {}, breadcrumbs: Values { values: [] }, exception: Values { values: [] }, stacktrace: None, template: None, threads: Values { values: [] }, tags: {}, extra: {}, debug_meta: DebugMeta { sdk_info: None, images: [] }, sdk: None }), Transaction(Transaction { event_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9d, name: None, release: None, environment: None, tags: {}, extra: {}, sdk: None, platform: "other", timestamp: None, start_timestamp: [..], spans: [Span { span_id: SpanId([212, 44, 238, 159, 195, 231, 79, 92]), trace_id: TraceId([51, 94, 83, 214, 20, 71, 74, 204, 159, 137, 230, 50, 183, 118, 204, 40]), parent_span_id: None, same_process_as_parent: None, op: None, description: None, timestamp: None, start_timestamp: [..], status: None, tags: {}, data: {} }], contexts: {}, request: None, active_thread_id: None }), SessionUpdate(SessionUpdate { session_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c, distinct_id: Some("[email protected]"), sequence: None, timestamp: None, started: [..], init: true, duration: Some(1.234), status: Ok, errors: 123, attributes: SessionAttributes { release: "[email protected]", environment: Some("production"), ip_address: None, user_agent: None } }), Attachment(Attachment { buffer: 12, filename: "file.txt", content_type: Some("application/octet-stream"), type: Some(Attachment) })] }
+  DEBUG   [..] Envelope { event_id: Some(22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c), items: EnvelopeItems([Event(Event { event_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c, level: Error, fingerprint: ["{{ default }}"], culprit: None, transaction: None, message: None, logentry: None, logger: None, modules: {}, platform: "other", timestamp: [..], server_name: None, release: None, dist: None, environment: None, user: None, request: None, contexts: {}, breadcrumbs: Values { values: [] }, exception: Values { values: [] }, stacktrace: None, template: None, threads: Values { values: [] }, tags: {}, extra: {}, debug_meta: DebugMeta { sdk_info: None, images: [] }, sdk: None }), Transaction(Transaction { event_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9d, name: None, release: None, environment: None, tags: {}, extra: {}, sdk: None, platform: "other", timestamp: None, start_timestamp: [..], spans: [Span { span_id: SpanId([212, 44, 238, 159, 195, 231, 79, 92]), trace_id: TraceId([51, 94, 83, 214, 20, 71, 74, 204, 159, 137, 230, 50, 183, 118, 204, 40]), parent_span_id: None, same_process_as_parent: None, op: None, description: None, timestamp: None, start_timestamp: [..], status: None, tags: {}, data: {} }], contexts: {}, request: None, active_thread_id: None }), SessionUpdate(SessionUpdate { session_id: 22d00b3f-d1b1-4b5d-8d20-49d138cd8a9c, distinct_id: Some("[email protected]"), sequence: None, timestamp: None, started: [..], init: true, duration: Some(1.234), status: Ok, errors: 123, attributes: SessionAttributes { release: "[email protected]", environment: Some("production"), ip_address: None, user_agent: None } }), Attachment(Attachment { buffer: 12, filename: "file.txt", content_type: Some("application/octet-stream"), type: Some(Attachment) })]) }
 Envelope from file tests/integration/_fixtures/envelope.dat dispatched
 
 ```

tests/integration/_cases/send_envelope/send_envelope-help.trycmd

@@ -36,4 +36,7 @@ OPTIONS:
 
             [aliases: silent]
 
+        --raw
+            Send envelopes without attempting to parse their contents.
+
 ```