diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a18be3a04..064280c997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Removed all `sentry-cli files ...` and `sentry-cli releases files ...` subcommands ([#2956](https://github.com/getsentry/sentry-cli/pull/2956)). These commands provided functionality for managing release files, a feature that has been deprecated in Sentry. Users still using `sentry-cli files upload` to upload source maps should migrate to `sentry-cli sourcemaps upload`. - Removed the `sentry-cli sourcemaps explain` command ([#2947](https://github.com/getsentry/sentry-cli/pull/2947)). The command had been deprecated for some time, since Sentry now has a better in-product debugging flow for source map problems via the "Unminify Code" button, which is displayed on any JavaScript issues which could not be unminified. +- Removed the `sentry-cli send-metric ...` subcommands ([#3006](https://github.com/getsentry/sentry-cli/pull/3006)). These commands have been deprecated, and the data they send is no longer accepted by Sentry. - Removed support for the legacy API key authentication method ([#2935](https://github.com/getsentry/sentry-cli/pull/2935)). Sentry CLI now only supports authenticating with Auth Tokens. If you are using API key authentication via any of the following methods, you need to generate and use an [Auth Token](https://docs.sentry.io/account/auth-tokens/), instead: - `--api-key` CLI flag - `SENTRY_API_KEY` environment variable diff --git a/Cargo.lock b/Cargo.lock index df75ea579f..8ad61c8cad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2304,8 +2304,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha 0.3.1", "rand_core 0.6.4", ] @@ -2315,20 +2313,10 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.3", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_chacha" version = "0.9.0" @@ -2344,9 +2332,6 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.16", -] [[package]] name = "rand_core" @@ -2654,9 +2639,9 @@ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "sentry" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +checksum = "d9794f69ad475e76c057e326175d3088509649e3aed98473106b9fe94ba59424" dependencies = [ "curl", "httpdate", @@ -2667,9 +2652,9 @@ dependencies = [ [[package]] name = "sentry-anyhow" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d672bfd1ed4e90978435f3c0704edb71a7a9d86403657839d518cd6aa278aff5" +checksum = "d1832cd051f3198af8ebc5222da5fd213e49976d758b7defa7accbff3aed1909" dependencies = [ "anyhow", "sentry-backtrace", @@ -2678,12 +2663,11 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +checksum = "e81137ad53b8592bd0935459ad74c0376053c40084aa170451e74eeea8dbc6c3" dependencies = [ "backtrace", - "once_cell", "regex", "sentry-core", ] @@ -2760,9 +2744,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +checksum = "cfb403c66cc2651a01b9bacda2e7c22cd51f7e8f56f206aa4310147eb3259282" dependencies = [ "hostname", "libc", @@ -2774,31 +2758,29 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +checksum = "cfc409727ae90765ca8ea76fe6c949d6f159a11d02e130b357fa652ee9efcada" dependencies = [ - "crc32fast", - "once_cell", - "rand 0.8.5", - "regex", + "rand 0.9.2", "sentry-types", "serde", "serde_json", + "url", ] [[package]] name = "sentry-types" -version = "0.34.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +checksum = "c7b9b4e4c03a4d3643c18c78b8aa91d2cbee5da047d2fa0ca4bb29bc67e6c55c" dependencies = [ "debugid", "hex", - "rand 0.8.5", + "rand 0.9.2", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.17", "time", "url", "uuid", diff --git a/Cargo.toml b/Cargo.toml index f49fc51e6c..a1fa02d206 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,11 +54,10 @@ regex = "1.7.3" runas = "1.0.0" rust-ini = "0.18.0" semver = "1.0.16" -sentry = { version = "0.34.0", default-features = false, features = [ +sentry = { version = "0.46.0", default-features = false, features = [ "anyhow", "curl", "contexts", - "metrics", ] } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.93" diff --git a/src/commands/derive_parser.rs b/src/commands/derive_parser.rs index 72d27f7c57..2383260d6d 100644 --- a/src/commands/derive_parser.rs +++ b/src/commands/derive_parser.rs @@ -4,7 +4,6 @@ use clap::{ArgAction::SetTrue, Parser, Subcommand}; use super::dart_symbol_map::DartSymbolMapArgs; use super::logs::LogsArgs; -use super::send_metric::SendMetricArgs; #[derive(Parser)] pub(super) struct SentryCLI { @@ -35,6 +34,5 @@ pub(super) struct SentryCLI { #[derive(Subcommand)] pub(super) enum SentryCLICommand { Logs(LogsArgs), - SendMetric(SendMetricArgs), DartSymbolMap(DartSymbolMapArgs), } diff --git a/src/commands/logs/mod.rs b/src/commands/logs/mod.rs index ce0c2cdc4e..fb44207218 100644 --- a/src/commands/logs/mod.rs +++ b/src/commands/logs/mod.rs @@ -42,7 +42,6 @@ pub(super) fn execute(_: &ArgMatches) -> Result<()> { let SentryCLICommand::Logs(LogsArgs { subcommand }) = SentryCLI::parse().command else { unreachable!("expected logs subcommand"); }; - eprintln!("{BETA_WARNING}"); match subcommand { diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 330ea7383f..dac94c33c7 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -38,7 +38,6 @@ mod releases; mod repos; mod send_envelope; mod send_event; -mod send_metric; mod sourcemaps; #[cfg(not(feature = "managed"))] mod uninstall; @@ -67,7 +66,6 @@ macro_rules! each_subcommand { $mac!(repos); $mac!(send_event); $mac!(send_envelope); - $mac!(send_metric); $mac!(sourcemaps); $mac!(dart_symbol_map); #[cfg(not(feature = "managed"))] diff --git a/src/commands/send_metric/distribution.rs b/src/commands/send_metric/distribution.rs deleted file mode 100644 index 2c4f644eba..0000000000 --- a/src/commands/send_metric/distribution.rs +++ /dev/null @@ -1,15 +0,0 @@ -use super::common_args::FloatValueMetricArgs; -use crate::{api::envelopes_api::EnvelopesApi, utils::metrics::DefaultTags as _}; -use anyhow::Result; -use sentry::metrics::Metric; - -pub(super) fn execute(args: FloatValueMetricArgs) -> Result<()> { - EnvelopesApi::try_new()?.send_envelope( - Metric::distribution(args.common.name, args.value) - .with_unit(args.common.unit) - .with_tags(args.common.tags.with_default_tags()) - .finish() - .to_envelope(), - )?; - Ok(()) -} diff --git a/src/commands/send_metric/gauge.rs b/src/commands/send_metric/gauge.rs deleted file mode 100644 index 16ad13c0bf..0000000000 --- a/src/commands/send_metric/gauge.rs +++ /dev/null @@ -1,15 +0,0 @@ -use super::common_args::FloatValueMetricArgs; -use crate::{api::envelopes_api::EnvelopesApi, utils::metrics::DefaultTags as _}; -use anyhow::Result; -use sentry::metrics::Metric; - -pub(super) fn execute(args: FloatValueMetricArgs) -> Result<()> { - EnvelopesApi::try_new()?.send_envelope( - Metric::gauge(args.common.name, args.value) - .with_unit(args.common.unit) - .with_tags(args.common.tags.with_default_tags()) - .finish() - .to_envelope(), - )?; - Ok(()) -} diff --git a/src/utils/metrics.rs b/src/utils/metrics.rs deleted file mode 100644 index 2f331614da..0000000000 --- a/src/utils/metrics.rs +++ /dev/null @@ -1,29 +0,0 @@ -use crate::config::Config; - -use super::releases; - -pub trait DefaultTags { - fn with_default_tags(self) -> Self; -} - -impl DefaultTags for Vec<(String, String)> { - fn with_default_tags(mut self) -> Self { - let contains_release = self.iter().any(|(key, _)| key == "release"); - let contains_environment = self.iter().any(|(key, _)| key == "environment"); - if !contains_release { - if let Ok(release) = releases::detect_release_name() { - self.push(("release".into(), release)); - } - } - if !contains_environment { - self.push(( - "environment".into(), - Config::current() - .get_environment() - .filter(|e| !e.is_empty()) - .unwrap_or("production".into()), - )); - } - self - } -} diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 63baa14657..9f47f2a88a 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -15,7 +15,6 @@ pub mod formatting; pub mod fs; pub mod http; pub mod logging; -pub mod metrics; pub mod non_empty; pub mod progress; pub mod proguard; diff --git a/tests/integration/_cases/send_metric/individual_config/send_metric-increment-no-dsn.trycmd b/tests/integration/_cases/send_metric/individual_config/send_metric-increment-no-dsn.trycmd deleted file mode 100644 index 87fec5a093..0000000000 --- a/tests/integration/_cases/send_metric/individual_config/send_metric-increment-no-dsn.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testmetric -? failed -... -error: DSN missing. Please set the `SENTRY_DSN` environment variable to your project's DSN. - -Add --log-level=[info|debug] or export SENTRY_LOG_LEVEL=[info|debug] to see more output. -Please attach the full debug log to all bug reports. - -``` diff --git a/tests/integration/_cases/send_metric/individual_config/send_metric-increment-unsuccessful-api-call.trycmd b/tests/integration/_cases/send_metric/individual_config/send_metric-increment-unsuccessful-api-call.trycmd deleted file mode 100644 index 9daf861460..0000000000 --- a/tests/integration/_cases/send_metric/individual_config/send_metric-increment-unsuccessful-api-call.trycmd +++ /dev/null @@ -1,13 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testmetric -? failed -[..] -error: API request failed - -Caused by: -[..]sentry reported an error: internal server error (http status: 500) - -Add --log-level=[info|debug] or export SENTRY_LOG_LEVEL=[info|debug] to see more output. -Please attach the full debug log to all bug reports. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-all-options-long-with-float-value.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-all-options-long-with-float-value.trycmd deleted file mode 100644 index cd1f21bca5..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-all-options-long-with-float-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric distribution --name testMetric --value 2.3 --unit mb --tags a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2.3|d|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-all-options-short-with-int-value.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-all-options-short-with-int-value.trycmd deleted file mode 100644 index 2db60885db..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-all-options-short-with-int-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric distribution -n testMetric -v 2 -u mb -t a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2|d|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-no-options.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-no-options.trycmd deleted file mode 100644 index 0b64c89e97..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-no-options.trycmd +++ /dev/null @@ -1,12 +0,0 @@ -``` -$ sentry-cli send-metric distribution -? failed -error: the following required arguments were not provided: - --name - --value - -Usage: sentry-cli[EXE] send-metric distribution --name --value - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-normalization.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-normalization.trycmd deleted file mode 100644 index a63a9aec91..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-normalization.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric distribution -v 1 -n "aA1_-./+รถ{๐Ÿ˜€ |\\," -u "aA1_-./+รถ{๐Ÿ˜€ |\\," -t "aA1_-./+รถ{๐Ÿ˜€ |\\:aA1_-./+รถ{๐Ÿ˜€ |\\" release:testRelease environment:testEnv +:b +:+ a: :b : -? success -... -{} -{"type":"statsd","length":[..]} -aA1_-.__________@aA1_:1|d|#aA1_-./:aA1_-./+รถ{๐Ÿ˜€ /t/u{7c}//,environment:testEnv,release:testRelease|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-numerical-key-prefix.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-numerical-key-prefix.trycmd deleted file mode 100644 index 8451c5f63b..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-numerical-key-prefix.trycmd +++ /dev/null @@ -1,8 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric distribution -v 1 -n 1mymetric -? failed -error: invalid value '1mymetric' for '--name ': metric name must start with an alphabetic character - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-distribution-required-options-with-negative-value.trycmd b/tests/integration/_cases/send_metric/send_metric-distribution-required-options-with-negative-value.trycmd deleted file mode 100644 index aea6b25b25..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-distribution-required-options-with-negative-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric distribution -n testMetric -v=-3.2 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:-3.2|d|#environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-all-options-long-with-float-value.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-all-options-long-with-float-value.trycmd deleted file mode 100644 index 021a8d6938..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-all-options-long-with-float-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric gauge --name testMetric --value 2.3 --unit mb --tags a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2.3|g|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-all-options-short-with-int-value.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-all-options-short-with-int-value.trycmd deleted file mode 100644 index c81d7cf8d3..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-all-options-short-with-int-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric gauge -n testMetric -v 2 -u mb -t a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2|g|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-no-options.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-no-options.trycmd deleted file mode 100644 index a5a791d61d..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-no-options.trycmd +++ /dev/null @@ -1,12 +0,0 @@ -``` -$ sentry-cli send-metric gauge -? failed -error: the following required arguments were not provided: - --name - --value - -Usage: sentry-cli[EXE] send-metric gauge --name --value - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-normalization.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-normalization.trycmd deleted file mode 100644 index 3645f06212..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-normalization.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric gauge -v 1 -n "aA1_-./+รถ{๐Ÿ˜€ |\\," -u "aA1_-./+รถ{๐Ÿ˜€ |\\," -t "aA1_-./+รถ{๐Ÿ˜€ |\\:aA1_-./+รถ{๐Ÿ˜€ |\\" release:testRelease environment:testEnv +:b +:+ a: :b : -? success -... -{} -{"type":"statsd","length":[..]} -aA1_-.__________@aA1_:1|g|#aA1_-./:aA1_-./+รถ{๐Ÿ˜€ /t/u{7c}//,environment:testEnv,release:testRelease|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-numerical-key-prefix.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-numerical-key-prefix.trycmd deleted file mode 100644 index 25a0e7c00b..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-numerical-key-prefix.trycmd +++ /dev/null @@ -1,8 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric gauge -v 1 -n 1mymetric -? failed -error: invalid value '1mymetric' for '--name ': metric name must start with an alphabetic character - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-gauge-required-options-with-negative-value.trycmd b/tests/integration/_cases/send_metric/send_metric-gauge-required-options-with-negative-value.trycmd deleted file mode 100644 index ea027e0965..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-gauge-required-options-with-negative-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric gauge -n testMetric -v=-3.2 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:-3.2|g|#environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-all-options-long-with-float-value.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-all-options-long-with-float-value.trycmd deleted file mode 100644 index fbd50d4dbd..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-all-options-long-with-float-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric increment --name testMetric --value 2.3 --unit mb --tags a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2.3|c|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-all-options-short-with-int-value.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-all-options-short-with-int-value.trycmd deleted file mode 100644 index bd5fd53205..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-all-options-short-with-int-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testMetric -v 2 -u mb -t a:b --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:2|c|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-no-options.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-no-options.trycmd deleted file mode 100644 index da03248fce..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-no-options.trycmd +++ /dev/null @@ -1,11 +0,0 @@ -``` -$ sentry-cli send-metric increment -? failed -error: the following required arguments were not provided: - --name - -Usage: sentry-cli[EXE] send-metric increment --name - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-normalization-with-negative-value.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-normalization-with-negative-value.trycmd deleted file mode 100644 index 2a20cc6769..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-normalization-with-negative-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric increment -v=-3 -n "aA1_-./+รถ{๐Ÿ˜€ |\\," -u "aA1_-./+รถ{๐Ÿ˜€ |\\," -t "aA1_-./+รถ{๐Ÿ˜€ |\\:aA1_-./+รถ{๐Ÿ˜€ |\\" release:testRelease environment:testEnv +:b +:+ a: :b : -? success -... -{} -{"type":"statsd","length":[..]} -aA1_-.__________@aA1_:-3|c|#aA1_-./:aA1_-./+รถ{๐Ÿ˜€ /t/u{7c}//,environment:testEnv,release:testRelease|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-numerical-key-prefix.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-numerical-key-prefix.trycmd deleted file mode 100644 index 496cbc39ec..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-numerical-key-prefix.trycmd +++ /dev/null @@ -1,8 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric increment -v 1 -n 1mymetric -? failed -error: invalid value '1mymetric' for '--name ': metric name must start with an alphabetic character - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-required-options.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-required-options.trycmd deleted file mode 100644 index 6e22cfaea3..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-required-options.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testMetric --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:1|c|#environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-increment-tag-no-colon.trycmd b/tests/integration/_cases/send_metric/send_metric-increment-tag-no-colon.trycmd deleted file mode 100644 index 249c39edf9..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-increment-tag-no-colon.trycmd +++ /dev/null @@ -1,8 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testmetric -t ab,release:testRelease --log-level debug -? failed -error: invalid value 'ab' for '--tags ...': `ab` is missing a `:` - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-all-options-long-with-alphabetic-value.trycmd b/tests/integration/_cases/send_metric/send_metric-set-all-options-long-with-alphabetic-value.trycmd deleted file mode 100644 index 5d76c42e20..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-all-options-long-with-alphabetic-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric set --name testMetric --value abc --unit mb --tags a:b -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:891568578|s|#a:b,environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-all-options-short-with-int-value.trycmd b/tests/integration/_cases/send_metric/send_metric-set-all-options-short-with-int-value.trycmd deleted file mode 100644 index 9ffe0110c1..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-all-options-short-with-int-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric set -n testMetric -v 2 -u mb -t a:b,environment:testEnvironment,release:testRelease -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@mb:450215437|s|#a:b,environment:testEnvironment,release:testRelease|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-float-value.trycmd b/tests/integration/_cases/send_metric/send_metric-set-float-value.trycmd deleted file mode 100644 index b0de3c82e5..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-float-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric set -n testmetric -v 1.9 --log-level debug -? success -... -{} -{"type":"statsd","length":113} -testmetric@none:2397755281|s|#environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-no-options.trycmd b/tests/integration/_cases/send_metric/send_metric-set-no-options.trycmd deleted file mode 100644 index 5f49058130..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-no-options.trycmd +++ /dev/null @@ -1,12 +0,0 @@ -``` -$ sentry-cli send-metric set -? failed -error: the following required arguments were not provided: - --name - --value - -Usage: sentry-cli[EXE] send-metric set --name --value - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-normalization.trycmd b/tests/integration/_cases/send_metric/send_metric-set-normalization.trycmd deleted file mode 100644 index 27155540fe..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-normalization.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric set -v 1 -n "aA1_-./+รถ{๐Ÿ˜€ |\\," -u "aA1_-./+รถ{๐Ÿ˜€ |\\," -t "aA1_-./+รถ{๐Ÿ˜€ |\\:aA1_-./+รถ{๐Ÿ˜€ |\\" release:testRelease environment:testEnv +:b +:+ a: :b : -? success -... -{} -{"type":"statsd","length":[..]} -aA1_-.__________@aA1_:2212294583|s|#aA1_-./:aA1_-./+รถ{๐Ÿ˜€ /t/u{7c}//,environment:testEnv,release:testRelease|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-numerical-key-prefix.trycmd b/tests/integration/_cases/send_metric/send_metric-set-numerical-key-prefix.trycmd deleted file mode 100644 index 7823e55db8..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-numerical-key-prefix.trycmd +++ /dev/null @@ -1,8 +0,0 @@ -``` -$ sentry-cli --log-level debug send-metric set -v 1 -n 1mymetric -? failed -error: invalid value '1mymetric' for '--name ': metric name must start with an alphabetic character - -For more information, try '--help'. - -``` diff --git a/tests/integration/_cases/send_metric/send_metric-set-required-options-with-negative-value.trycmd b/tests/integration/_cases/send_metric/send_metric-set-required-options-with-negative-value.trycmd deleted file mode 100644 index bde4cb9642..0000000000 --- a/tests/integration/_cases/send_metric/send_metric-set-required-options-with-negative-value.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric set -n testMetric -v=-3 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:3726846214|s|#environment:production,release:[..]|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-distribution-default-tags.trycmd b/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-distribution-default-tags.trycmd deleted file mode 100644 index 54a1ad9401..0000000000 --- a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-distribution-default-tags.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric distribution -n testMetric -v 1 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:1|d|#environment:def_env,release:def_release|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-gauge-default-tags.trycmd b/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-gauge-default-tags.trycmd deleted file mode 100644 index f86ab472c4..0000000000 --- a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-gauge-default-tags.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric gauge -n testMetric -v 1 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:1|g|#environment:def_env,release:def_release|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-increment-default-tags.trycmd b/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-increment-default-tags.trycmd deleted file mode 100644 index ad14884813..0000000000 --- a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-increment-default-tags.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric increment -n testMetric --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:1|c|#environment:def_env,release:def_release|T[..] -... - -``` diff --git a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-set-default-tags.trycmd b/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-set-default-tags.trycmd deleted file mode 100644 index c93c89430a..0000000000 --- a/tests/integration/_cases/send_metric/with_release_and_environment/send_metric-set-default-tags.trycmd +++ /dev/null @@ -1,10 +0,0 @@ -``` -$ sentry-cli send-metric set -n testMetric -v 2 --log-level debug -? success -... -{} -{"type":"statsd","length":[..]} -testMetric@none:450215437|s|#environment:def_env,release:def_release|T[..] -... - -``` diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs index 525b90bd1b..f009aa72c7 100644 --- a/tests/integration/mod.rs +++ b/tests/integration/mod.rs @@ -18,7 +18,6 @@ mod react_native; mod releases; mod send_envelope; mod send_event; -mod send_metric; mod sourcemaps; mod test_utils; mod token_validation; diff --git a/tests/integration/send_metric.rs b/tests/integration/send_metric.rs deleted file mode 100644 index 35c94fdd6f..0000000000 --- a/tests/integration/send_metric.rs +++ /dev/null @@ -1,47 +0,0 @@ -use super::MockEndpointBuilder; -use crate::integration::TestManager; -use mockito::Matcher; -use trycmd::TestCases; - -fn envelopes_endpoint_builder() -> MockEndpointBuilder { - let expected_auth_header = Matcher::Regex( - r#"^Sentry sentry_key=test, sentry_version=7, sentry_timestamp=\d{10}(\.[0-9]+)?, sentry_client=sentry-cli/.*"#.to_owned(), - ); - - MockEndpointBuilder::new("POST", "/api/1337/envelope/") - .with_header_matcher("X-Sentry-Auth", expected_auth_header) -} - -#[test] -fn command_send_metric() { - TestManager::new() - .mock_endpoint(envelopes_endpoint_builder()) - .register_trycmd_test("send_metric/*.trycmd"); -} - -#[test] -fn command_send_metric_release_and_environment() { - TestManager::new() - .mock_endpoint(envelopes_endpoint_builder()) - .register_trycmd_test("send_metric/with_release_and_environment/*.trycmd") - .env("SENTRY_RELEASE", "def_release") - .env("SENTRY_ENVIRONMENT", "def_env"); -} - -#[test] -fn command_send_metric_increment_no_dsn() { - let _manager = TestManager::new().mock_endpoint(envelopes_endpoint_builder()); - - // Custom test case setup because we don't want the DSN to be set by the manager. - TestCases::new() - .case("tests/integration/_cases/send_metric/individual_config/send_metric-increment-no-dsn.trycmd"); -} - -#[test] -fn command_send_metric_increment_unsuccessful_api_call() { - TestManager::new() - .mock_endpoint(MockEndpointBuilder::new("POST", "/api/1337/envelope/").with_status(500)) - .register_trycmd_test( - "send_metric/individual_config/send_metric-increment-unsuccessful-api-call.trycmd", - ); -}