Skip to content

Commit

Permalink
feat: update crates
Browse files Browse the repository at this point in the history
  • Loading branch information
@ralvescosta
ralvescosta committed Jun 7, 2024
1 parent d6e7152 commit cbb436c
Show file tree
Hide file tree
Showing 17 changed files with 433 additions and 311 deletions.
622 changes: 353 additions & 269 deletions Cargo.lock
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ resolver = "2"

exclude = [
"examples/http_api",
"examples/rmq-consumer"
"examples/rmq-consumer",
"examples/rmq-consumer-prom"
]

members = [
Expand All @@ -27,12 +28,12 @@ members = [
]

[workspace.dependencies]
thiserror = { version = "1.0.60" }
serde = { version = "1.0.202" }
thiserror = { version = "1.0.61" }
serde = { version = "1.0.203" }
serde_json = { version = "1.0.117" }
tokio = { version = "1.37.0" }
tokio = { version = "1.38.0" }
async-trait = { version = "0.1.80" }
tracing = { version = "0.1.40" }
tonic = { version = "0.11" }
opentelemetry = { version = "0.22.0" }
opentelemetry_sdk = { version = "0.22.1" }
opentelemetry = { version = "0.23.0" }
opentelemetry_sdk = { version = "0.23.0" }
2 changes: 1 addition & 1 deletion auth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-trait = { workspace = true }
opentelemetry = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
reqwest = { version = "0.12.3", features = ["json"] }
reqwest = { version = "0.12.4", features = ["json"] }
moka = { version = "0.12.7", features = ["future"] }
jsonwebtoken = { version = "9.3.0" }

Expand Down
8 changes: 4 additions & 4 deletions examples/http_api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ sql-pool = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.3.0",
migrator = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.3.0", features = ["postgres"] }
health-readiness = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.3.0"}

actix-web = { version = "4.5.1" }
serde = { version = "1.0.202" }
actix-web = { version = "4.6.0" }
serde = { version = "1.0.203" }
serde_json = { version = "1.0.117" }
opentelemetry = { version = "0.22" }
opentelemetry = { version = "0.23" }
async-trait = { version = "0.1.80" }
tracing = { version = "0.1.40" }
tokio = { version = "1.37.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
tokio = { version = "1.38.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
utoipa = { version = "4.2.3" }
validator = { version = "0.18.1" }
10 changes: 5 additions & 5 deletions examples/rmq-consumer-prom/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ migrator = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0",
health-http-server = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0", features = ["prometheus"]}
health-readiness = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0", features=["rabbitmq"]}

serde = { version = "1.0.200" }
serde_json = { version = "1.0.116" }
opentelemetry = { version = "0.22" }
async-trait = { version = "0.1.77" }
serde = { version = "1.0.203" }
serde_json = { version = "1.0.117" }
opentelemetry = { version = "0.23" }
async-trait = { version = "0.1.80" }
tracing = { version = "0.1.40" }
tokio = { version = "1.37.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
tokio = { version = "1.38.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
lapin = { version = "2.3.4" }
37 changes: 37 additions & 0 deletions examples/rmq-consumer-prom/a.drawio
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<mxfile host="65bd71144e">
<diagram id="UFXtG8m6ZOe-1FoDh3VJ" name="Page-1">
<mxGraphModel dx="983" dy="439" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="2" value="filters-single-messages" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="70" y="190" width="150" height="60" as="geometry"/>
</mxCell>
<mxCell id="3" value="filters-multiple-messages" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="80" y="340" width="150" height="60" as="geometry"/>
</mxCell>
<mxCell id="4" value="HTTP /metrics" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="210" y="150" width="100" height="90" as="geometry"/>
</mxCell>
<mxCell id="5" value="HTTP /metrics" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="220" y="310" width="100" height="90" as="geometry"/>
</mxCell>
<mxCell id="7" style="edgeStyle=none;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="6" target="4">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="8" style="edgeStyle=none;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="6" target="5">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="6" value="Prometheus" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="460" y="150" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="10" value="PromSQL" style="edgeStyle=none;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="9" target="6">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="9" value="Grafana" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="690" y="150" width="120" height="60" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
10 changes: 5 additions & 5 deletions examples/rmq-consumer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ migrator = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0",
health-http-server = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0"}
health-readiness = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.4.0", features=["rabbitmq"]}

serde = { version = "1.0.200" }
serde_json = { version = "1.0.116" }
opentelemetry = { version = "0.22" }
async-trait = { version = "0.1.77" }
serde = { version = "1.0.203" }
serde_json = { version = "1.0.117" }
opentelemetry = { version = "0.23" }
async-trait = { version = "0.1.80" }
tracing = { version = "0.1.40" }
tokio = { version = "1.37.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
tokio = { version = "1.38.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
lapin = { version = "2.3.4" }
4 changes: 2 additions & 2 deletions health_http_server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ health-readiness = { path = '../health_readiness' }
thiserror = { workspace = true }
tracing = { workspace = true }
opentelemetry = { workspace = true }
actix-web = { version = "4.5.1" }
actix-web = { version = "4.6.0" }

prometheus = { version = "0.13.3", optional = true }
prometheus = { version = "0.13.4", optional = true }


6 changes: 3 additions & 3 deletions health_readiness/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ tracing = { workspace = true }
thiserror = { workspace = true }

# mqtt
paho-mqtt = { version = "0.12.3", optional = true }
paho-mqtt = { version = "0.12.5", optional = true }

# rabbitmq
lapin = { version = "2.3.3", optional = true }
lapin = { version = "2.3.4", optional = true }

# postgres
deadpool-postgres = { version = "0.13.2", optional = true }
deadpool-postgres = { version = "0.14.0", optional = true }

8 changes: 4 additions & 4 deletions http_components/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ validator = ["dep:validator"]
health = ["dep:health-readiness"]

[dependencies]
actix-web = { version = "4.5.1" }
actix-http = { version = "3.6.0" }
actix-web = { version = "4.6.0" }
actix-http = { version = "3.7.0" }
actix-cors = { version = "0.7.0" }
futures-util = { version = "0.3.30" }
serde = { workspace = true, features = ["derive"] }
Expand All @@ -38,8 +38,8 @@ auth = { path = "../auth", optional = true }
otel = { path = "../otel", optional = true }

# metrics
opentelemetry-semantic-conventions = { version = "0.14", optional = true }
opentelemetry-prometheus = { version = "0.15", optional = true }
opentelemetry-semantic-conventions = { version = "0.15", optional = true }
opentelemetry-prometheus = { version = "0.16", optional = true }
prometheus = { version = "0.13.4", optional = true }

# health
Expand Down
4 changes: 2 additions & 2 deletions http_server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ http-components = { path = '../http_components', features = ["tracing", "metrics
health-readiness = { path = '../health_readiness' }
auth = { path = "../auth" }

actix-web = { version = "4.5.1" }
actix-web = { version = "4.6.0" }
thiserror = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand All @@ -21,4 +21,4 @@ opentelemetry = { workspace = true }

# Swagger
utoipa = { version = "4.2.3", features = ["actix_extras"], optional = true }
utoipa-swagger-ui = { version = "7.0.1", features = ["actix-web"], optional = true }
utoipa-swagger-ui = { version = "7.1.0", features = ["actix-web"], optional = true }
6 changes: 3 additions & 3 deletions metrics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ thiserror = { workspace = true }
# OTLP Featue
tonic = { workspace = true, features = ["tls"], optional = true }
tokio = { workspace = true, features = ["default"], optional = true }
opentelemetry-otlp = { version = "0.15", features = ["metrics", "prost", "grpc-tonic", "gzip-tonic","tls", "tls-roots"], optional = true }
opentelemetry-otlp = { version = "0.16", features = ["metrics", "prost", "grpc-tonic", "gzip-tonic","tls", "tls-roots"], optional = true }

# Prometheus Feature
prometheus = { version = "0.13.3" }
opentelemetry-prometheus = { version = "0.15", optional = true }
prometheus = { version = "0.13.4" }
opentelemetry-prometheus = { version = "0.16", optional = true }

# Stdout
opentelemetry-stdout = { version = "0.3", features = ["metrics"], optional = true }
2 changes: 1 addition & 1 deletion migrator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ async-trait = { workspace = true }
tracing = { workspace = true }
thiserror = { workspace = true }

deadpool-postgres = { version = "0.13.2", optional = true }
deadpool-postgres = { version = "0.14.0", optional = true }
deadpool-sqlite = { version = "0.8.1", optional = true }
2 changes: 1 addition & 1 deletion mqtt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ opentelemetry = { workspace = true }
tracing = { workspace = true }
async-trait = { workspace = true }
bytes = { version = "1.6.0", features = ["serde"] }
paho-mqtt = { version = "0.12.3" }
paho-mqtt = { version = "0.12.5" }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
futures-util = { version = "0.3.30" }
Expand Down
4 changes: 2 additions & 2 deletions secrets_manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ mocks = ["dep:mockall"]
[dependencies]
async-trait = { workspace = true }
tracing = { workspace = true }
aws-config = { version = "1.4.0" }
aws-sdk-secretsmanager = { version = "1.27.0" }
aws-config = { version = "1.5.1" }
aws-sdk-secretsmanager = { version = "1.32.0" }
serde_json = { workspace = true }
thiserror = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion sql_pool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tracing = { workspace = true }
thiserror = { workspace = true }

# PostgreSQL dep
deadpool-postgres = { version = "0.13.2", optional = true }
deadpool-postgres = { version = "0.14.0", optional = true }
tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4", "with-uuid-0_8"], optional = true }

# SQLite dep
Expand Down
4 changes: 2 additions & 2 deletions traces/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ serde = { workspace = true, features = ["derive"] }
tonic = { workspace = true, features = ["tls"] }
tokio = { workspace = true, features = ["default"] }

opentelemetry-otlp = { version = "0.15", features = ["tonic", "tls", "tls-roots"], optional = true }
opentelemetry-otlp = { version = "0.16", features = ["tonic", "tls", "tls-roots"], optional = true }

opentelemetry-stdout = { version = "0.3", features = ["trace"], optional = true }
opentelemetry-stdout = { version = "0.4", features = ["trace"], optional = true }

0 comments on commit cbb436c

Please sign in to comment.