Merge pull request #5 from tointernet/develop

Develop
tointernet · May 16, 2024 · 0e899a3 · 0e899a3
2 parents 3a37578 + d6e7152
commit 0e899a3
Show file tree

Hide file tree

Showing 24 changed files with 4,941 additions and 164 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,9 +27,9 @@ members = [
 ]
 
 [workspace.dependencies]
-thiserror = { version = "1.0.59" }
-serde = { version = "1.0.198" }
-serde_json = { version = "1.0.116" }
+thiserror = { version = "1.0.60" }
+serde = { version = "1.0.202" }
+serde_json = { version = "1.0.117" }
 tokio = { version = "1.37.0" }
 async-trait = { version = "0.1.80" }
 tracing = { version = "0.1.40" }

diff --git a/examples/http_api/Cargo.toml b/examples/http_api/Cargo.toml
@@ -17,11 +17,11 @@ migrator = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.3.0",
 health-readiness = {git = "ssh://git@github.com/tointernet/ruskit.git", rev = "v0.3.0"}
 
 actix-web = { version = "4.5.1" }
-serde = { version = "1.0.200" }
-serde_json = { version = "1.0.116" }
+serde = { version = "1.0.202" }
+serde_json = { version = "1.0.117" }
 opentelemetry = { version = "0.22" }
-async-trait = { version = "0.1.77" }
+async-trait = { version = "0.1.80" }
 tracing = { version = "0.1.40" }
 tokio = { version = "1.37.0", features = ["default", "rt-multi-thread", "macros", "signal"]}
-utoipa = { version = "4.2.0" }
+utoipa = { version = "4.2.3" }
 validator = { version = "0.18.1" }
diff --git a/examples/rmq-consumer-prom/.cargo/config b/examples/rmq-consumer-prom/.cargo/config
@@ -0,0 +1,2 @@
+[net]
+git-fetch-with-cli = true
diff --git a/examples/rmq-consumer-prom/.dockerignore b/examples/rmq-consumer-prom/.dockerignore
@@ -0,0 +1,12 @@
+target/*.json
+target/*.TAG
+target/debug/.fingerprint
+target/debug/build
+target/debug/deps
+target/debug/examples
+target/debug/incremental
+target/release/.fingerprint
+target/release/build
+target/release/deps
+target/release/examples
+target/release/incremental
diff --git a/examples/rmq-consumer-prom/.env.local b/examples/rmq-consumer-prom/.env.local
@@ -0,0 +1,29 @@
+RUST_ENV=local
+LOG_LEVEL=debug
+APP_NAME=rmq-consumer-prom
+
+ENABLE_HEALTH_READINESS=true
+HEALTH_READINESS_PORT=8888
+
+SECRET_MANAGER=NONE
+
+RABBITMQ_HOST=rmq
+RABBITMQ_PORT=5672
+RABBITMQ_USER=guest
+RABBITMQ_PASSWORD=guest
+
+#OTLP Configs
+ENABLE_TRACES=false
+TRACE_SERVICE_TYPE=AMQP
+TRACE_HOST=localhost
+TRACE_KEY=key
+TRACE_EXPORT_TIMEOUT=60
+TRACE_EXPORT_RATE_BASE=0.7
+
+ENABLE_METRICS=true
+METRIC_SERVICE_TYPE=AMQP
+METRIC_EXPORTER=prometheus
+METRIC_HOST=localhost
+METRIC_KEY=key
+METRIC_EXPORT_TIMEOUT=60
+METRIC_EXPORT_RATE_BASE=0.7
diff --git a/examples/rmq-consumer-prom/.env.prod b/examples/rmq-consumer-prom/.env.prod
@@ -0,0 +1,27 @@
+RUST_ENV=prod
+LOG_LEVEL=debug
+
+ENABLE_HEALTH_READINESS=true
+HEALTH_READINESS_PORT=8888
+
+SECRET_MANAGER=NONE
+
+RABBITMQ_HOST=rmq
+RABBITMQ_PORT=5672
+RABBITMQ_USER=guest
+RABBITMQ_PASSWORD=guest
+
+#OTLP Configs
+ENABLE_TRACES=false
+TRACE_SERVICE_TYPE=AMQP
+TRACE_HOST=localhost
+TRACE_KEY=key
+TRACE_EXPORT_TIMEOUT=60
+TRACE_EXPORT_RATE_BASE=0.7
+
+ENABLE_METRICS=true
+METRIC_SERVICE_TYPE=AMQP
+METRIC_HOST=localhost
+METRIC_KEY=key
+METRIC_EXPORT_TIMEOUT=60
+METRIC_EXPORT_RATE_BASE=0.7
diff --git a/examples/rmq-consumer-prom/.env.staging b/examples/rmq-consumer-prom/.env.staging
@@ -0,0 +1,27 @@
+RUST_ENV=staging
+LOG_LEVEL=debug
+
+ENABLE_HEALTH_READINESS=true
+HEALTH_READINESS_PORT=8888
+
+SECRET_MANAGER=NONE
+
+RABBITMQ_HOST=rmq
+RABBITMQ_PORT=5672
+RABBITMQ_USER=guest
+RABBITMQ_PASSWORD=guest
+
+#OTLP Configs
+ENABLE_TRACES=false
+TRACE_SERVICE_TYPE=AMQP
+TRACE_HOST=localhost
+TRACE_KEY=key
+TRACE_EXPORT_TIMEOUT=60
+TRACE_EXPORT_RATE_BASE=0.7
+
+ENABLE_METRICS=true
+METRIC_SERVICE_TYPE=AMQP
+METRIC_HOST=localhost
+METRIC_KEY=key
+METRIC_EXPORT_TIMEOUT=60
+METRIC_EXPORT_RATE_BASE=0.7