Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily remove Gaggle support, upgrade all dependencies #529

Merged
merged 9 commits into from
Dec 9, 2022
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
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog

## 0.16.5-dev
## 0.17.0
- [#529](https://github.com/tag1consulting/goose/pull/529) **API change** temporaryily removed Gaggle support `gaggle` feature) to allow upgrading Tokio and other dependencies.
- if you require Gaggle support, use Goose 0.16.4 with Tokio 0.15 for now; Gaggle support is being added back in https://github.com/tag1consulting/goose/pull/509
- updated Tokio to 1.23, updated tungestenite and tokio-tungstenite to 0.18; updated ctrlc to 3.2; updated num_cpus to 1.14, updated simplelog to 0.12, updated nix to 0.26, updated rustls to 0.20, updates serial_test to 0.9
- removed `nng` dependency and `gaggle` feature
- removed `--manager`, `--expect-workers`, `--no-hash-check`, `--manager-bind-host`, `--manager-bind-port`, `--worker`, `--manager-host`, `--manager-port` and related configuration defaults
- removed `AttackMode::Manager` and `AttackMode::Worker`
- ignore all Gaggle tests, will re-enable these tests when Gaggle support is re-implemented
- Box `TransactionError` to avoid over-allocating memory on the stack (see `examples/session.rs` for an example of working with this)

## 0.16.4 September 20, 2022
- [#512](https://github.com/tag1consulting/goose/pull/512) include proper HTTP method and path in logs and html report when using `GooseRequest::builder()`
Expand Down
31 changes: 12 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "goose"
version = "0.16.5-dev"
version = "0.17.0-dev"
authors = ["Jeremy Andrews <[email protected]>"]
edition = "2018"
description = "A load testing framework inspired by Locust."
Expand All @@ -14,16 +14,16 @@ license = "Apache-2.0"
[dependencies]
async-trait = "0.1"
chrono = "0.4"
ctrlc = "3.1"
downcast-rs = "1.2.0"
ctrlc = "3.2"
downcast-rs = "1.2"
flume = "0.10"
futures = "0.3"
gumdrop = "0.8"
http = "0.2"
itertools = "0.10"
lazy_static = "1.4"
log = "0.4"
num_cpus = "1.0"
num_cpus = "1.14"
num-format = "0.4"
rand = "0.8"
regex = "1"
Expand All @@ -37,10 +37,10 @@ serde = { version = "1.0", features = [
] }
serde_cbor = "0.11"
serde_json = "1.0"
simplelog = "0.10"
simplelog = "0.12"
strum = "0.24"
strum_macros = "0.24"
tokio = { version = "~1.15.0", features = [
tokio = { version = "1.23", features = [
"fs",
"io-util",
"macros",
Expand All @@ -49,24 +49,17 @@ tokio = { version = "~1.15.0", features = [
"time",
"sync",
] }
tokio-tungstenite = "0.15"
tungstenite = "0.15"
tokio-tungstenite = "0.18"
tungstenite = "0.18"
url = "2"

# optional dependencies
nng = { version = "1.0", optional = true }

[features]
default = ["reqwest/default-tls"]
gaggle = ["nng"]
rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls-tls"]

[build-dependencies]
rustc_version = "0.4"
rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls"]

[dev-dependencies]
httpmock = "0.6"
native-tls = "0.2"
nix = "0.24"
rustls = "0.19"
serial_test = "0.5"
nix = "0.26"
rustls = "0.20"
serial_test = "0.9"
22 changes: 0 additions & 22 deletions build.rs

This file was deleted.

2 changes: 1 addition & 1 deletion examples/drupal_memcache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ async fn drupal_memcache_post_comment(user: &mut GooseUser) -> TransactionResult
let headers = &response.headers().clone();
match response.text().await {
Ok(html) => {
if !html.contains(&comment_body) {
if !html.contains(comment_body) {
// This will automatically get written to the error log if enabled, and will
// be displayed to stdout if `-v` is enabled when running the load test.
return user.set_failure(
Expand Down
13 changes: 7 additions & 6 deletions examples/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ async fn main() -> Result<(), GooseError> {
/// per user, when the user thread first starts.
async fn website_signup(user: &mut GooseUser) -> TransactionResult {
let params = [("username", "test_user"), ("password", "")];
let response = user
.post_form("/signup", &params)
.await?
.response?
.json::<AuthenticationResponse>()
.await?;
let response = match user.post_form("/signup", &params).await?.response {
Ok(r) => match r.json::<AuthenticationResponse>().await {
Ok(j) => j,
Err(e) => return Err(Box::new(e.into())),
},
Err(e) => return Err(Box::new(e.into())),
};

user.set_session_data(Session {
jwt_token: response.jwt_token,
Expand Down
Loading