Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 117 additions & 50 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ name = "hoc"
[dependencies]
actix-rt = "1.1.1"
actix-web = "3.3.2"
actix-web-opentelemetry = "0.10.0"
badge = "0.3.0"
bytes = "1.0.1"
config = { version = "0.11.0", features = ["toml"] }
Expand All @@ -24,6 +25,10 @@ git2 = "0.13.17"
lazy_static = "1.4.0"
number_prefix = "0.4.0"
openssl-probe = "0.1.2"
# TODO: upgrade
opentelemetry = { version = "0.12.0", default-features = false, features = ["trace"] }
# TODO: upgrade
opentelemetry-jaeger = "0.11.0"
reqwest = "0.10.10"
serde = "1.0.125"
serde_derive = "1.0.123"
Expand All @@ -33,6 +38,7 @@ tracing-actix-web = "0.2.1"
tracing-bunyan-formatter = "0.1.7"
tracing-futures = "0.2.5"
tracing-log = "0.1.2"
tracing-opentelemetry = "0.11.0"
tracing-subscriber = { version = "0.2.17", features = ["registry", "env-filter"] }

[build-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use actix_web::{
middleware::{self, normalize::TrailingSlash},
web, App, HttpResponse, HttpServer, Responder,
};
use actix_web_opentelemetry::RequestTracing;
use badge::{Badge, BadgeOptions};
use git2::{BranchType, Repository};
use number_prefix::NumberPrefix;
Expand Down Expand Up @@ -480,6 +481,7 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
App::new()
.app_data(state.clone())
.app_data(repo_count.clone())
.wrap(RequestTracing::new())
.wrap(tracing_actix_web::TracingLogger)
.wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
.service(index)
Expand Down
12 changes: 7 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
use hoc::{config::Settings, telemetry};

use std::net::TcpListener;

fn init() {
fn init() -> opentelemetry_jaeger::Uninstall {
dotenv::dotenv().ok();
openssl_probe::init_ssl_cert_env_vars();

telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))
let (subscriber, uninstall) = telemetry::get_subscriber("hoc", "info");
telemetry::init_subscriber(subscriber);
uninstall
}

#[actix_rt::main]
async fn main() -> std::io::Result<()> {
init();
let _uninstall = init();

// TODO: error handling
let settings = Settings::load().expect("Cannot load config");

let address = format!("{}:{}", settings.host, settings.port);
// TODO: error handling
let listener = TcpListener::bind(address)?;
let listener = TcpListener::bind(address).expect("cannot bind addres");

hoc::run(listener, settings)
.await
.expect("Server error")
Expand Down
Loading