diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18972ea20..3de27e4dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+
+## 1.68.3 (2023-10-02)
+
+#### Breaking Changes
+
+* Run GCM through FCMv1 HTTP API (#455) ([b2282277](https://github.com/mozilla-services/autopush-rs/commit/b2282277e7e751f5e513d65dda1ab2d2635e7299), breaks [#](https://github.com/mozilla-services/autopush-rs/issues/))
+
+#### Features
+
+* Run GCM through FCMv1 HTTP API (#455) ([b2282277](https://github.com/mozilla-services/autopush-rs/commit/b2282277e7e751f5e513d65dda1ab2d2635e7299), breaks [#](https://github.com/mozilla-services/autopush-rs/issues/))
+
+#### Bug Fixes
+
+* re-enable slog's envlogger (#452) ([e76b1198](https://github.com/mozilla-services/autopush-rs/commit/e76b11987400888bae17fdf61e7dff3edaa7743d))
+* AutopushUser fails with WebSocketConnectionClosedException ([5f8efb2d](https://github.com/mozilla-services/autopush-rs/commit/5f8efb2db9550b8960c6052c69e1103ab8681041))
+
+#### Test
+
+* calibrate load tests ([1b5c5f99](https://github.com/mozilla-services/autopush-rs/commit/1b5c5f99a503ff5a70f009651ad4c47d39c6468e))
+* add subscribe and unsubscribe tasks to AutopushUser ([07d988dd](https://github.com/mozilla-services/autopush-rs/commit/07d988dd11a79d053eb93237f8de977490c5c510))
+
+
## 1.68.2 (2023-09-27)
diff --git a/Cargo.lock b/Cargo.lock
index d73846bc9..8954a3fb7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -522,7 +522,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "autoconnect"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix",
"actix-cors",
@@ -549,7 +549,7 @@ dependencies = [
"lazy_static",
"log",
"mozsvc-common",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"sentry",
"sentry-actix",
"sentry-core",
@@ -567,13 +567,13 @@ dependencies = [
[[package]]
name = "autoconnect_common"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix-web",
"autopush_common",
"futures 0.3.28",
"futures-locks 0.7.1",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"sentry",
"serde",
"serde_derive",
@@ -586,7 +586,7 @@ dependencies = [
[[package]]
name = "autoconnect_settings"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"autoconnect_common",
"autopush_common",
@@ -595,7 +595,7 @@ dependencies = [
"fernet",
"lazy_static",
"mozsvc-common",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"serde",
"serde_derive",
"slog",
@@ -605,7 +605,7 @@ dependencies = [
[[package]]
name = "autoconnect_web"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix-codec",
"actix-http",
@@ -623,7 +623,7 @@ dependencies = [
"cadence",
"ctor",
"futures-util",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"serde_json",
"slog-scope",
"thiserror",
@@ -633,7 +633,7 @@ dependencies = [
[[package]]
name = "autoconnect_ws"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix-http",
"actix-rt",
@@ -659,7 +659,7 @@ dependencies = [
[[package]]
name = "autoconnect_ws_sm"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix-rt",
"actix-web",
@@ -672,7 +672,7 @@ dependencies = [
"ctor",
"futures 0.3.28",
"mockall",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"sentry",
"slog-scope",
"thiserror",
@@ -682,7 +682,7 @@ dependencies = [
[[package]]
name = "autoendpoint"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"a2",
"actix-cors",
@@ -710,7 +710,7 @@ dependencies = [
"openssl",
"rand 0.8.5",
"regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"rusoto_core 0.47.0",
"rusoto_dynamodb 0.47.0",
"sentry",
@@ -738,7 +738,7 @@ dependencies = [
[[package]]
name = "autopush"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"autopush_common",
"base64 0.21.4",
@@ -791,7 +791,7 @@ dependencies = [
[[package]]
name = "autopush_common"
-version = "1.68.2"
+version = "1.68.3"
dependencies = [
"actix-http",
"actix-rt",
@@ -821,7 +821,7 @@ dependencies = [
"protobuf",
"rand 0.8.5",
"regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"rusoto_core 0.47.0",
"rusoto_credential 0.47.0",
"rusoto_dynamodb 0.47.0",
@@ -2918,7 +2918,7 @@ checksum = "51fba38c7ded23ca88a409f72277d177170b3eadb5e283741182fd3cae60ecdf"
dependencies = [
"hostname",
"lazy_static",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
]
[[package]]
@@ -3733,9 +3733,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.11.20"
+version = "0.11.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef"
dependencies = [
"base64 0.21.4",
"bytes 1.5.0",
@@ -3758,6 +3758,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded 0.7.1",
+ "system-configuration",
"tokio 1.32.0",
"tokio-native-tls",
"tower-service",
@@ -4227,7 +4228,7 @@ dependencies = [
"httpdate",
"log",
"native-tls",
- "reqwest 0.11.20",
+ "reqwest 0.11.21",
"sentry-backtrace",
"sentry-contexts",
"sentry-core",
@@ -4767,6 +4768,27 @@ dependencies = [
"unicode-xid 0.2.4",
]
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "take_mut"
version = "0.2.2"
diff --git a/Cargo.toml b/Cargo.toml
index 1ffc1ff46..9a1562bd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,19 @@
[workspace]
members = [
- "autopush-common",
- "autopush",
- "autoendpoint",
- "autoconnect",
- "autoconnect/autoconnect-common",
- "autoconnect/autoconnect-settings",
- "autoconnect/autoconnect-web",
- "autoconnect/autoconnect-ws",
- "autoconnect/autoconnect-ws/autoconnect-ws-sm",
+ "autopush-common",
+ "autopush",
+ "autoendpoint",
+ "autoconnect",
+ "autoconnect/autoconnect-common",
+ "autoconnect/autoconnect-settings",
+ "autoconnect/autoconnect-web",
+ "autoconnect/autoconnect-ws",
+ "autoconnect/autoconnect-ws/autoconnect-ws-sm",
]
resolver = "2"
[workspace.package]
-version = "1.68.2"
+version = "1.68.3"
authors = [
"Ben Bangert ",
"JR Conlin ",
@@ -45,32 +45,50 @@ ctor = "0.2"
docopt = "1.1"
env_logger = "0.10"
fernet = "0.2.0"
-futures = {version="0.3", features=["compat"]}
-futures-util = {version="0.3", features=["async-await", "compat", "sink", "io"]}
+futures = { version = "0.3", features = ["compat"] }
+futures-util = { version = "0.3", features = [
+ "async-await",
+ "compat",
+ "sink",
+ "io",
+] }
futures-locks = "0.7"
hex = "0.4.2"
httparse = "1.3"
hyper = "0.14"
lazy_static = "1.4"
-log = { version = "0.4", features = ["max_level_debug", "release_max_level_info"] }
+log = { version = "0.4", features = [
+ "max_level_debug",
+ "release_max_level_info",
+] }
mockall = "0.11"
mozsvc-common = "0.2"
-openssl = {version="0.10" }
+openssl = { version = "0.10" }
rand = "0.8"
regex = "1.4"
-reqwest = {version="0.11", features = ["json"] }
-rusoto_core = { version="0.47", default-features=false, features=["rustls"] } # locked by serde_dynamodb 0.9
-rusoto_credential = { version="0.47"} # locked by serde_dynamodb 0.9
-rusoto_dynamodb = { version="0.47", default-features=false, features=["rustls"]} # locked by serde_dynamodb 0.9
-sentry = { version = "0.31", features = ["debug-logs"] } # Using debug-logs avoids https://github.com/getsentry/sentry-rust/issues/237
-sentry-core = {version = "0.31"}
+reqwest = { version = "0.11", features = ["json"] }
+rusoto_core = { version = "0.47", default-features = false, features = [
+ "rustls",
+] } # locked by serde_dynamodb 0.9
+rusoto_credential = { version = "0.47" } # locked by serde_dynamodb 0.9
+rusoto_dynamodb = { version = "0.47", default-features = false, features = [
+ "rustls",
+] } # locked by serde_dynamodb 0.9
+sentry = { version = "0.31", features = [
+ "debug-logs",
+] } # Using debug-logs avoids https://github.com/getsentry/sentry-rust/issues/237
+sentry-core = { version = "0.31" }
sentry-actix = "0.31"
sentry-backtrace = "0.31"
serde = "1.0"
serde_derive = "1.0"
serde_dynamodb = "0.9"
serde_json = "1.0"
-slog = { version = "2.7", features = ["dynamic-keys", "max_level_trace", "release_max_level_info"] }
+slog = { version = "2.7", features = [
+ "dynamic-keys",
+ "max_level_trace",
+ "release_max_level_info",
+] }
slog-async = "2.6"
slog-envlogger = "2.2.0"
slog-mozlog-json = "0.1"
@@ -84,7 +102,7 @@ tokio-core = "0.1"
tokio-io = "0.1"
tokio-openssl = "0.6"
# Use older version of tungstenite to support legacy connection server.
-tungstenite = { version = "0.9.2", default-features = false } # 0.10+ requires tokio 0.3+
+tungstenite = { version = "0.9.2", default-features = false } # 0.10+ requires tokio 0.3+
uuid = { version = "1.1", features = ["serde", "v4"] }
url = "2.2"
@@ -93,8 +111,8 @@ autoconnect_common = { path = "./autoconnect/autoconnect-common" }
autoconnect_settings = { path = "./autoconnect/autoconnect-settings" }
autoconnect_web = { path = "./autoconnect/autoconnect-web" }
autoconnect_ws = { path = "./autoconnect/autoconnect-ws" }
-autoconnect_ws_clientsm = { path ="./autoconnect/autoconnect-ws/autoconnect-ws-clientsm" }
-autopush_common = { path = "./autopush-common", features=["bigtable"]}
+autoconnect_ws_clientsm = { path = "./autoconnect/autoconnect-ws/autoconnect-ws-clientsm" }
+autopush_common = { path = "./autopush-common", features = ["bigtable"] }
[profile.release]
debug = 1