Fix test initialization

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: cargo
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-  open-pull-requests-limit: 10
-  assignees:
-  - vbrandl

.gitlab-ci.yml

@@ -0,0 +1,53 @@
+image: docker:19.03
+services:
+  - docker:19.03-dind
+
+stages:
+  - build
+  - release
+
+variables:
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+  # DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_TLS_CERTDIR: ""
+  CONTAINER_BUILDER_IMAGE: $CI_REGISTRY_IMAGE:builder-latest
+  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+
+before_script:
+  - export CONTAINER_TAG_IMAGE="$CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:1}"
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
+build:
+  stage: build
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE || true
+    - docker pull $CONTAINER_RELEASE_IMAGE || true
+    - docker pull $CONTAINER_TAG_IMAGE || true
+    - docker pull $CONTAINER_BUILDER_IMAGE || true
+    - docker build --pull -t $CONTAINER_BUILDER_IMAGE --target builder .
+    - docker build --pull -t $CONTAINER_TEST_IMAGE .
+    - docker push $CONTAINER_BUILDER_IMAGE
+    - docker push $CONTAINER_TEST_IMAGE
+
+release-image:
+  stage: release
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
+    - docker push $CONTAINER_RELEASE_IMAGE
+  only:
+    - master
+
+release-tag:
+  stage: release
+  script:
+    - docker pull $CONTAINER_TEST_IMAGE
+    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE
+    - docker push $CONTAINER_TAG_IMAGE
+  only:
+    - /^v\d+\.\d+\.\d+/
+  except:
+    - branch
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.19.0"
+version = "0.17.1"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
@@ -13,34 +13,39 @@ path = "src/main.rs"
 name = "hoc"
 
 [dependencies]
-actix-rt = "2.2.0"
-actix-web = "4.0.0-beta.8"
+actix-rt = "1.1.1"
+actix-web = "3.3.2"
+actix-web-opentelemetry = "0.10.0"
 badge = "0.3.0"
-bytes = "1.1.0"
+bytes = "1.0.1"
 config = { version = "0.11.0", features = ["toml"] }
 dotenv = "0.15.0"
-futures = "0.3.17"
-git2 = "0.13.21"
+futures = "0.3.13"
+git2 = "0.13.17"
 lazy_static = "1.4.0"
 number_prefix = "0.4.0"
-openssl-probe = "0.1.4"
-reqwest = "0.11.4"
-serde = "1.0.130"
+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"
-serde_json = "1.0.67"
-tracing = "0.1.26"
-tracing-actix-web = "0.4.0-beta.11"
-tracing-bunyan-formatter = "0.2.5"
+serde_json = "1.0.64"
+tracing = "0.1.25"
+tracing-actix-web = "0.2.1"
+tracing-bunyan-formatter = "0.1.7"
 tracing-futures = "0.2.5"
 tracing-log = "0.1.2"
-tracing-subscriber = { version = "0.2.20", features = ["registry", "env-filter"] }
+tracing-opentelemetry = "0.11.0"
+tracing-subscriber = { version = "0.2.17", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-ructe = "0.13.4"
-vergen = { version = "5.1.15", default-features = false, features = ["git"] }
+ructe = "0.13.0"
+vergen = { version = "5.1.0", default-features = false, features = ["git"] }
 
 [dev-dependencies]
-awc = "3.0.0-beta.7"
-ructe = "0.13.4"
+ructe = "0.13.0"
 tempfile = "3.2.0"
-tokio = "1.11.0"
+tokio = "0.2.25"

Dockerfile

@@ -1,8 +1,7 @@
 FROM ekidd/rust-musl-builder:stable as builder
 
 # create new cargo project
-RUN USER=rust cargo init --lib
-RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
+RUN USER=rust cargo init --bin
 # copy build config
 COPY --chown=rust ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml

README.md

@@ -19,8 +19,8 @@ The API is as simple as
 https://<host>/<service>/<user>/<repo>
 ```
 
-where `<service>` is one of `gitub`, `gitlab`, `bitbucket` or `sourcehut`. The HoC data can also be received as JSON by
-appending `/json` to the reuqest path:
+where `<service>` is one of `gitub`, `gitlab` or `bitbucket`. The HoC data can also be received as JSON by appending
+`/json` to the reuqest path:
 
 ```
 https://<host>/<service>/<user>/<repo>/json

src/cache.rs

@@ -101,9 +101,9 @@ impl<'a> CacheState<'a> {
                 entries.insert(
                     branch.into(),
                     CacheEntry {
+                        commits,
                         head,
                         count,
-                        commits,
                     },
                 );
                 Cache { entries }

src/lib.rs

@@ -22,16 +22,17 @@ use crate::{
     cache::CacheState,
     config::Settings,
     error::{Error, Result},
-    service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
+    service::{Bitbucket, FormService, GitHub, Gitlab, Service},
     statics::{CLIENT, CSS, FAVICON, VERSION_INFO},
     template::RepoInfo,
 };
 use actix_web::{
     dev::Server,
     http::header::{CacheControl, CacheDirective, Expires, LOCATION},
-    middleware::{self, TrailingSlash},
+    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;
@@ -224,10 +225,10 @@ where
         })?;
         repo_count.fetch_sub(1, Ordering::Relaxed);
         Ok(HttpResponse::TemporaryRedirect()
-            .insert_header((
+            .header(
                 LOCATION,
                 format!("/{}/{}/{}/view", T::url_path(), data.0, data.1),
-            ))
+            )
             .finish())
     };
     future.instrument(span).await
@@ -318,8 +319,8 @@ fn no_cache_response(body: Vec<u8>) -> HttpResponse {
     let expiration = SystemTime::now() + Duration::from_secs(30);
     HttpResponse::Ok()
         .content_type("image/svg+xml")
-        .insert_header(Expires(expiration.into()))
-        .insert_header(CacheControl(vec![
+        .set(Expires(expiration.into()))
+        .set(CacheControl(vec![
             CacheDirective::MaxAge(0u32),
             CacheDirective::MustRevalidate,
             CacheDirective::NoCache,
@@ -480,7 +481,8 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
         App::new()
             .app_data(state.clone())
             .app_data(repo_count.clone())
-            .wrap(tracing_actix_web::TracingLogger::default())
+            .wrap(RequestTracing::new())
+            .wrap(tracing_actix_web::TracingLogger)
             .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
             .service(index)
             .service(health_check)
@@ -490,7 +492,6 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
             .service(web::resource("/github/{user}/{repo}").to(calculate_hoc::<GitHub>))
             .service(web::resource("/gitlab/{user}/{repo}").to(calculate_hoc::<Gitlab>))
             .service(web::resource("/bitbucket/{user}/{repo}").to(calculate_hoc::<Bitbucket>))
-            .service(web::resource("/sourcehut/{user}/{repo}").to(calculate_hoc::<Sourcehut>))
             .service(
                 web::resource("/github/{user}/{repo}/delete")
                     .route(web::post().to(delete_repo_and_cache::<GitHub>)),
@@ -503,22 +504,16 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
                 web::resource("/bitbucket/{user}/{repo}/delete")
                     .route(web::post().to(delete_repo_and_cache::<Bitbucket>)),
             )
-            .service(
-                web::resource("/sourcehut/{user}/{repo}/delete")
-                    .route(web::post().to(delete_repo_and_cache::<Sourcehut>)),
-            )
             .service(web::resource("/github/{user}/{repo}/json").to(json_hoc::<GitHub>))
             .service(web::resource("/gitlab/{user}/{repo}/json").to(json_hoc::<Gitlab>))
             .service(web::resource("/bitbucket/{user}/{repo}/json").to(json_hoc::<Bitbucket>))
-            .service(web::resource("/sourcehut/{user}/{repo}/json").to(json_hoc::<Sourcehut>))
             .service(web::resource("/view/github/{user}/{repo}").to(overview::<GitHub>))
             .service(web::resource("/view/gitlab/{user}/{repo}").to(overview::<Gitlab>))
             .service(web::resource("/view/bitbucket/{user}/{repo}").to(overview::<Bitbucket>))
             .service(web::resource("/github/{user}/{repo}/view").to(overview::<GitHub>))
             .service(web::resource("/gitlab/{user}/{repo}/view").to(overview::<Gitlab>))
             .service(web::resource("/bitbucket/{user}/{repo}/view").to(overview::<Bitbucket>))
-            .service(web::resource("/sourcehut/{user}/{repo}/view").to(overview::<Sourcehut>))
-            .default_service(web::to(async_p404))
+            .default_service(web::resource("").route(web::get().to(async_p404)))
     })
     .workers(workers)
     .listen(listener)?

src/main.rs

@@ -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")

src/service.rs

@@ -12,8 +12,6 @@ pub(crate) enum FormService {
     Gitlab,
     #[serde(rename = "bitbucket")]
     Bitbucket,
-    #[serde(rename = "sourcehut")]
-    Sourcehut,
 }
 
 impl FormService {
@@ -22,7 +20,6 @@ impl FormService {
             FormService::GitHub => "github.com",
             FormService::Gitlab => "gitlab.com",
             FormService::Bitbucket => "bitbucket.org",
-            FormService::Sourcehut => "git.sr.ht",
         }
     }
 
@@ -31,7 +28,6 @@ impl FormService {
             FormService::GitHub => "github",
             FormService::Gitlab => "gitlab",
             FormService::Bitbucket => "bitbucket",
-            FormService::Sourcehut => "sourcehut",
         }
     }
 }
@@ -77,17 +73,3 @@ impl Service for Bitbucket {
         format!("https://{}/{}/commits/{}", Self::domain(), repo, commit_ref)
     }
 }
-
-pub(crate) struct Sourcehut;
-
-impl Service for Sourcehut {
-    fn domain() -> &'static str {
-        "git.sr.ht"
-    }
-    fn url_path() -> &'static str {
-        "sourcehut"
-    }
-    fn commit_url(repo: &str, commit_ref: &str) -> String {
-        format!("https://{}/{}/commit/{}", Self::domain(), repo, commit_ref)
-    }
-}

src/telemetry.rs

@@ -1,18 +1,32 @@
+use opentelemetry::global;
+use opentelemetry_jaeger::Uninstall;
 use tracing::{subscriber::set_global_default, Subscriber};
 use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
 use tracing_log::LogTracer;
 use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
 
-pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send + Sync {
+// TODO: don't pass `Uninstall` around...
+pub fn get_subscriber(name: &str, env_filter: &str) -> (impl Subscriber + Send + Sync, Uninstall) {
     let env_filter =
         EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(env_filter));
 
     let formatting_layer = BunyanFormattingLayer::new(name.to_string(), std::io::stdout);
 
-    Registry::default()
-        .with(env_filter)
-        .with(JsonStorageLayer)
-        .with(formatting_layer)
+    global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
+    let (tracer, uninstall) = opentelemetry_jaeger::new_pipeline()
+        .with_service_name(name)
+        .install()
+        .expect("cannot install jaeger pipeline");
+    let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
+
+    (
+        Registry::default()
+            .with(telemetry)
+            .with(env_filter)
+            .with(JsonStorageLayer)
+            .with(formatting_layer),
+        uninstall,
+    )
 }
 
 pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) {

templates/index.rs.html

@@ -20,7 +20,7 @@ gives an overview about the amount of work put into a codebase.
 <p>
 There is a <a href="https://github.com/yegor256/hoc/">command-line tool</a> to calculate the HoC of a repository, but
 some people might want a nice badge to put in their README, that's why I implemented this API. Currently the API can be
-used for GitHub, GitLab, Bitbucket and Sourcehut repositories. Just put the following code in your README:
+used for GitHub, GitLab and Bitbucket repositories. Just put the following code in your README:
 </p>
 
 <pre>
@@ -28,8 +28,8 @@ used for GitHub, GitLab, Bitbucket and Sourcehut repositories. Just put the foll
 </pre>
 
 <p>
-where <code>&lt;service&gt;</code> is one of <code>github</code>, <code>gitlab</code>, <code>bitbucket</code> or
-<code>sourcehut</code>. So the following Markdown
+where <code>&lt;service&gt;</code> is one of <code>github</code>, <code>gitlab</code> or <code>bitbucket</code>. So the
+following Markdown
 </p>
 
 <pre>
@@ -74,7 +74,6 @@ the lines of
         <option value="github">GitHub</option>
         <option value="gitlab">Gitlab</option>
         <option value="bitbucket">Bitbucket</option>
-        <option value="sourcehut">Sourcehut</option>
     </select>
     <label>/</label>
     <input name="user" id="user" type="text" placeholder="user" />
@@ -95,7 +94,7 @@ welcome.
 
 <p>
     You can reach me via mail: <a href="mailto:mail+hoc@@vbrandl.net">mail+hoc@@vbrandl.net</a> preferably using
-my <a href="https://www.vbrandl.net/static/keys/0x1FFE431282F4B8CC0A7579167FB009175885FC76.asc">GPG key</a>
+my <a href="https://mirror.oldsql.cc/key.asc">GPG key</a>
 (<a href="http://pool.sks-keyservers.net/pks/lookup?op=get&amp;search=0x1FFE431282F4B8CC0A7579167FB009175885FC76">from a
     keyserver</a>), or by using any other UID from my key.
 </p>

tests/badge.rs

@@ -1,10 +1,12 @@
 mod util;
 
+use actix_web::client;
+
 #[actix_rt::test]
 async fn badge_succeeds() {
     let test_app = util::spawn_app().await;
 
-    let client = awc::Client::default();
+    let client = client::Client::default();
 
     let response = client
         .get(&format!("{}/github/vbrandl/hoc", test_app.address))

tests/health_check.rs

@@ -1,10 +1,12 @@
 mod util;
 
+use actix_web::client;
+
 #[actix_rt::test]
 async fn health_check_works() {
     let test_app = util::spawn_app().await;
 
-    let client = awc::Client::default();
+    let client = client::Client::default();
 
     let response = client
         .get(&format!("{}/health_check", test_app.address))

tests/index.rs

@@ -1,10 +1,12 @@
 mod util;
 
+use actix_web::client;
+
 #[actix_rt::test]
 async fn index_returns_success() {
     let test_app = util::spawn_app().await;
 
-    let client = awc::Client::default();
+    let client = client::Client::default();
 
     let response = client
         .get(&format!("{}/", test_app.address))

tests/json.rs

@@ -1,10 +1,12 @@
 mod util;
 
+use actix_web::client;
+
 #[actix_rt::test]
 async fn json_returns_success() {
     let test_app = util::spawn_app().await;
 
-    let client = awc::Client::default();
+    let client = client::Client::default();
 
     let response = client
         .get(&format!("{}/github/vbrandl/hoc/json", test_app.address))

tests/util/mod.rs

@@ -7,7 +7,7 @@ use tempfile::{tempdir, TempDir};
 lazy_static::lazy_static! {
     static ref TRACING: () = {
         let filter = if std::env::var("TEST_LOG").is_ok() { "debug" } else { "" };
-        let subscriber = telemetry::get_subscriber("test", filter);
+        let subscriber = telemetry::get_subscriber("test", filter).0;
         telemetry::init_subscriber(subscriber);
     };
 }