chore: Update rust and cargo deps

christianfosli · Sep 24, 2023 · 5d7582d · 5d7582d
1 parent e19c6b6
commit 5d7582d
Show file tree

Hide file tree

Showing 10 changed files with 275 additions and 308 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
   "front-end",

diff --git a/front-end/Cargo.toml b/front-end/Cargo.toml
@@ -18,10 +18,10 @@ wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
 log = "0.4"
 wasm-logger = "0.2"
-gloo-dialogs = "0.1"
-gloo-events = "0.1"
-gloo-timers = "0.2"
-gloo-utils = "0.1"
+gloo-dialogs = "0.2"
+gloo-events = "0.2"
+gloo-timers = "0.3"
+gloo-utils = "0.2"
 futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"

diff --git a/front-end/Dockerfile b/front-end/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.71 AS builder
+FROM rust:1.72 AS builder
 # Pass a unique VERSION as build arg to bust browser cache
 ARG VERSION=latest 
 ARG BUILD_PROFILE=release

diff --git a/highscore-api/Cargo.toml b/highscore-api/Cargo.toml
@@ -13,13 +13,13 @@ highscore-types = { path = "../highscore-types" }
 axum = { version = "0.6" }
 mongodb = { version = "2", features = ["tracing-unstable"] }
 bson = { version = "2", features = ["time-0_3"] }
-opentelemetry = "0.19"
+opentelemetry = "0.20"
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 time = { version = "0.3", features = ["parsing", "serde-well-known"] }
 tracing = "0.1"
-tracing-opentelemetry = "0.19"
+tracing-opentelemetry = "0.21"
 tracing-subscriber = "0.3"
-axum-tracing-opentelemetry = "0.11"
-init-tracing-opentelemetry = { version = "0.12.0-alpha.0", features = ["tracing_subscriber_ext", "otlp"] }
+axum-tracing-opentelemetry = "0.14"
+init-tracing-opentelemetry = { version = "0.14", features = ["tracing_subscriber_ext", "otlp"] }
 futures = "0.3"
diff --git a/highscore-api/Dockerfile b/highscore-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.71 AS builder
+FROM rust:1.72 AS builder
 ARG CARGO_INSTALL_OPTIONS=''
 WORKDIR /app
 # Build the service

diff --git a/highscore-api/src/main.rs b/highscore-api/src/main.rs
@@ -4,7 +4,7 @@ use axum::{
     routing::{get, post},
     Router, Server,
 };
-use axum_tracing_opentelemetry::opentelemetry_tracing_layer;
+use axum_tracing_opentelemetry::middleware::{OtelAxumLayer, OtelInResponseLayer};
 use init_tracing_opentelemetry::tracing_subscriber_ext;
 use mongodb::{options::ClientOptions, Client, Database};
 use tokio::signal;
@@ -24,7 +24,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .route("/submit", post(submit::submit))
         .route("/readyz", get(health::ready))
         .route("/livez", get(health::live))
-        .layer(opentelemetry_tracing_layer())
+        .layer(OtelInResponseLayer::default())
+        .layer(OtelAxumLayer::default())
         .with_state(db);
 
     let addr = env::var("LISTEN_ADDR")

diff --git a/highscore-cleanup-job/Cargo.toml b/highscore-cleanup-job/Cargo.toml
@@ -8,12 +8,12 @@ highscore-types = { path = "../highscore-types" }
 
 mongodb = { version = "2", features = ["tracing-unstable"] }
 bson = { version = "2", features = ["time-0_3"] }
-opentelemetry = "0.19"
+opentelemetry = "0.20"
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 time = { version = "0.3", features = ["parsing", "serde-well-known"] }
 tracing = "0.1"
-tracing-opentelemetry = "0.19"
+tracing-opentelemetry = "0.21"
 tracing-subscriber = "0.3"
-init-tracing-opentelemetry = { version = "0.12.0-alpha.0", features = ["tracing_subscriber_ext", "otlp"] }
+init-tracing-opentelemetry = { version = "0.14", features = ["tracing_subscriber_ext", "otlp"] }
 futures = "0.3"
diff --git a/highscore-cleanup-job/Dockerfile b/highscore-cleanup-job/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.71 AS builder
+FROM rust:1.72 AS builder
 ARG CARGO_INSTALL_OPTIONS=''
 WORKDIR /app
 # Build the service

diff --git a/highscore-types/Cargo.toml b/highscore-types/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bson = "2.6.1"
-serde = "1.0.166"
+bson = "2"
+serde = "1"