Skip to content

Commit 4563448

Browse files
authored
Upgrade a few more dependencies (#1284)
2 parents 6e40bd5 + 624a1f1 commit 4563448

File tree

10 files changed

+50
-122
lines changed

10 files changed

+50
-122
lines changed

.github/workflows/bridge-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
curl \
7373
libssl-dev=* \
7474
pkg-config=0.29.* \
75-
protobuf-compiler=* \
7675
zlib1g-dev=1:*
7776
7877
- name: Build

.github/workflows/bridge-security.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ on:
1111
- 'bridge/**/Cargo.toml'
1212
- 'bridge/**/Cargo.lock'
1313
- '.github/workflows/bridge-security.yml'
14+
- 'deny.toml'
1415
pull_request:
1516
paths:
1617
- 'bridge/**/Cargo.toml'
1718
- 'bridge/**/Cargo.lock'
1819
- '.github/workflows/bridge-security.yml'
20+
- 'deny.toml'
1921

2022
jobs:
2123
security_audit:

.github/workflows/server-security.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ on:
1111
- 'server/**/Cargo.toml'
1212
- 'server/**/Cargo.lock'
1313
- '.github/workflows/server-security.yml'
14+
- 'deny.toml'
1415
pull_request:
1516
paths:
1617
- 'server/**/Cargo.toml'
1718
- 'server/**/Cargo.lock'
1819
- '.github/workflows/server-security.yml'
20+
- 'deny.toml'
1921

2022
jobs:
2123
security_audit:

bridge/Cargo.lock

Lines changed: 35 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bridge/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y \
77
curl=7.* \
88
libssl-dev=* \
99
pkg-config=0.29.* \
10-
protobuf-compiler=* \
1110
zlib1g-dev=1:* \
1211
--no-install-recommends
1312

bridge/svix-bridge/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ axum = { version = "0.6", features = ["macros"] }
1212
enum_dispatch = "0.3"
1313
http = "0.2"
1414
once_cell = "1.18.0"
15-
opentelemetry = "0.21.0"
16-
opentelemetry_sdk = { version = "0.21.2", features = ["metrics", "rt-tokio"] }
17-
opentelemetry-otlp = { version = "0.14.0", features = ["metrics", "grpc-tonic", "http-proto", "reqwest-client"] }
15+
opentelemetry = "0.22.0"
16+
opentelemetry_sdk = { version = "0.22.1", features = ["metrics", "rt-tokio"] }
17+
opentelemetry-otlp = { version = "0.15.0", features = ["metrics", "grpc-tonic", "http-proto", "reqwest-client"] }
1818
serde = { version = "1", features = ["derive"] }
1919
serde_json = "1"
2020
serde_yaml = "0.9"
@@ -23,7 +23,7 @@ svix-bridge-plugin-queue = { optional=true, path = "../svix-bridge-plugin-queue"
2323
svix-bridge-types = { path = "../svix-bridge-types" }
2424
tokio = { version = "1", features = ["full"] }
2525
tracing = "0.1"
26-
tracing-opentelemetry = "0.22.0"
26+
tracing-opentelemetry = "0.23.0"
2727
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json"] }
2828
# N.b. for newer deno versions (like this) the runtimes must be retained and reused since they will leak memory if you
2929
# create/drop them.

bridge/svix-bridge/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use clap::Parser;
88
use once_cell::sync::Lazy;
99
use opentelemetry_otlp::WithExportConfig;
1010
use opentelemetry_sdk::{
11-
metrics::{data::Temporality, reader::TemporalitySelector, InstrumentKind, MeterProvider},
11+
metrics::{data::Temporality, reader::TemporalitySelector, InstrumentKind, SdkMeterProvider},
1212
runtime::Tokio,
1313
};
1414
use svix_bridge_types::{SenderInput, TransformerJob};
@@ -144,7 +144,7 @@ impl TemporalitySelector for DeltaTemporalitySelector {
144144
}
145145
}
146146

147-
pub fn setup_metrics(cfg: &Config) -> Option<MeterProvider> {
147+
pub fn setup_metrics(cfg: &Config) -> Option<SdkMeterProvider> {
148148
cfg.opentelemetry.as_ref().map(|otel_cfg| {
149149
let exporter = opentelemetry_otlp::new_exporter()
150150
.tonic()

deny.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ targets = [
99
db-path = "~/.cargo/advisory-db"
1010
db-urls = ["https://github.com/rustsec/advisory-db"]
1111
vulnerability = "deny"
12-
unmaintained = "deny"
12+
unmaintained = "warn"
1313
yanked = "deny"
1414
notice = "warn"
1515
ignore = [

0 commit comments

Comments
 (0)