Fix test initialization

Use correct version of opentelemetry
2021-03-29 16:52:31 +02:00 · 2021-03-29 16:32:37 +02:00 · 2021-03-29 16:29:41 +02:00 · 2021-03-29 15:19:11 +02:00 · 2021-03-29 14:58:36 +02:00 · 2021-03-29 12:55:49 +02:00
8 changed files with 205 additions and 120 deletions
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -69,7 +69,8 @@ jobs:
    strategy:
      matrix:
        # add windows-latest when it is clear why tests are failing
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]

    steps:
      - name: Checkout sources
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,7 +17,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "log",
- "pin-project 0.4.27",
+ "pin-project 0.4.28",
 "tokio",
 "tokio-util",
 ]
@@ -80,7 +80,7 @@ dependencies = [
 "pin-project 1.0.5",
 "rand 0.7.3",
 "regex",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "serde_urlencoded",
 "sha-1",
@@ -108,7 +108,7 @@ dependencies = [
 "http",
 "log",
 "regex",
- "serde 1.0.123",
+ "serde 1.0.125",
 ]

 [[package]]
@@ -153,7 +153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb"
 dependencies = [
 "futures-util",
- "pin-project 0.4.27",
+ "pin-project 0.4.28",
 ]

 [[package]]
@@ -213,7 +213,7 @@ dependencies = [
 "futures-sink",
 "futures-util",
 "log",
- "pin-project 0.4.27",
+ "pin-project 0.4.28",
 "slab",
 ]

@@ -247,7 +247,7 @@ dependencies = [
 "mime",
 "pin-project 1.0.5",
 "regex",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "serde_urlencoded",
 "socket2",
@@ -268,12 +268,17 @@ dependencies = [
 ]

 [[package]]
-name = "addr2line"
-version = "0.14.1"
+name = "actix-web-opentelemetry"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
+checksum = "4ac71801f541f5225e71f522d56901b0be7fd6ee2181724a7e551b74249d0129"
 dependencies = [
- "gimli",
+ "actix-http",
+ "actix-web",
+ "futures",
+ "opentelemetry",
+ "opentelemetry-semantic-conventions",
+ "serde 1.0.125",
 ]

 [[package]]
@@ -300,6 +305,12 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "anyhow"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
+
 [[package]]
 name = "arrayvec"
 version = "0.5.2"
@@ -342,25 +353,11 @@ dependencies = [
 "mime",
 "percent-encoding",
 "rand 0.7.3",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "serde_urlencoded",
 ]

-[[package]]
-name = "backtrace"
-version = "0.3.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
-dependencies = [
- "addr2line",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "badge"
 version = "0.3.0"
@@ -500,14 +497,14 @@ dependencies = [

 [[package]]
 name = "config"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
+checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
 dependencies = [
 "lazy_static",
 "nom",
 "rust-ini",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde-hjson",
 "serde_json",
 "toml",
@@ -568,6 +565,16 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

+[[package]]
+name = "dashmap"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "num_cpus",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.11"
@@ -861,12 +868,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "gimli"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
 [[package]]
 name = "git2"
 version = "0.13.17"
@@ -932,6 +933,7 @@ version = "0.17.1"
 dependencies = [
 "actix-rt",
 "actix-web",
+ "actix-web-opentelemetry",
 "badge",
 "bytes 1.0.1",
 "config",
@@ -941,9 +943,11 @@ dependencies = [
 "lazy_static",
 "number_prefix",
 "openssl-probe",
+ "opentelemetry",
+ "opentelemetry-jaeger",
 "reqwest",
 "ructe",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_derive",
 "serde_json",
 "tempfile",
@@ -953,6 +957,7 @@ dependencies = [
 "tracing-bunyan-formatter",
 "tracing-futures",
 "tracing-log",
+ "tracing-opentelemetry",
 "tracing-subscriber",
 "vergen",
 ]
@@ -1068,6 +1073,12 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

+[[package]]
+name = "integer-encoding"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f"
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1209,16 +1220,6 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "linked-hash-map"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
-dependencies = [
- "serde 0.8.23",
- "serde_test",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.4"
@@ -1249,7 +1250,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
 dependencies = [
- "linked-hash-map 0.5.4",
+ "linked-hash-map",
 ]

 [[package]]
@@ -1437,12 +1438,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

-[[package]]
-name = "object"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
-
 [[package]]
 name = "once_cell"
 version = "1.7.0"
@@ -1488,6 +1483,55 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "opentelemetry"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514d24875c140ed269eecc2d1b56d7b71b573716922a763c317fb1b1b4b58f15"
+dependencies = [
+ "async-trait",
+ "dashmap",
+ "fnv",
+ "futures",
+ "js-sys",
+ "lazy_static",
+ "percent-encoding",
+ "pin-project 1.0.5",
+ "rand 0.8.3",
+ "thiserror",
+]
+
+[[package]]
+name = "opentelemetry-jaeger"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5677b3a361784aff6e2b1b30dbdb5f85f4ec57ff2ced41d9a481ad70a9d0b57"
+dependencies = [
+ "async-trait",
+ "lazy_static",
+ "opentelemetry",
+ "thiserror",
+ "thrift",
+]
+
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ecb679b997c41108a498e3ce8b933fe2f643a9a722ad8ca33f95edab84df106"
+dependencies = [
+ "opentelemetry",
+]
+
+[[package]]
+name = "ordered-float"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
+dependencies = [
+ "num-traits 0.2.14",
+]
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.6.0"
@@ -1530,11 +1574,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

 [[package]]
 name = "pin-project"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
+checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
 dependencies = [
- "pin-project-internal 0.4.27",
+ "pin-project-internal 0.4.28",
 ]

 [[package]]
@@ -1548,9 +1592,9 @@ dependencies = [

 [[package]]
 name = "pin-project-internal"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
+checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1809,7 +1853,7 @@ dependencies = [
 "native-tls",
 "percent-encoding",
 "pin-project-lite 0.2.4",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_urlencoded",
 "tokio",
 "tokio-tls",
@@ -1849,12 +1893,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"

-[[package]]
-name = "rustc-demangle"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -1874,6 +1912,12 @@ dependencies = [
 "owned_ttf_parser",
 ]

+[[package]]
+name = "rustversion"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
+
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -1942,9 +1986,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"

 [[package]]
 name = "serde"
-version = "1.0.123"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 dependencies = [
 "serde_derive",
 ]
@@ -1956,7 +2000,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
 dependencies = [
 "lazy_static",
- "linked-hash-map 0.3.0",
 "num-traits 0.1.43",
 "regex",
 "serde 0.8.23",
@@ -1964,9 +2007,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.123"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1975,22 +2018,13 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43535db9747a4ba938c0ce0a98cc631a46ebf943c9e1d604e091df6007620bf6"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
 dependencies = [
 "itoa",
 "ryu",
- "serde 1.0.123",
-]
-
-[[package]]
-name = "serde_test"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
-dependencies = [
- "serde 0.8.23",
+ "serde 1.0.125",
 ]

 [[package]]
@@ -2002,7 +2036,7 @@ dependencies = [
 "form_urlencoded",
 "itoa",
 "ryu",
- "serde 1.0.123",
+ "serde 1.0.125",
 ]

 [[package]]
@@ -2102,7 +2136,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
 "proc-macro2",
 "quote",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_derive",
 "syn",
 ]
@@ -2116,7 +2150,7 @@ dependencies = [
 "base-x",
 "proc-macro2",
 "quote",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_derive",
 "serde_json",
 "sha1",
@@ -2192,6 +2226,19 @@ dependencies = [
 "num_cpus",
 ]

+[[package]]
+name = "thrift"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b"
+dependencies = [
+ "byteorder",
+ "integer-encoding",
+ "log",
+ "ordered-float",
+ "threadpool",
+]
+
 [[package]]
 name = "time"
 version = "0.1.43"
@@ -2306,7 +2353,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
- "serde 1.0.123",
+ "serde 1.0.125",
 ]

 [[package]]
@@ -2361,7 +2408,7 @@ dependencies = [
 "chrono",
 "gethostname",
 "log",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "tracing",
 "tracing-core",
@@ -2399,13 +2446,26 @@ dependencies = [
 "tracing-core",
 ]

+[[package]]
+name = "tracing-opentelemetry"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1"
+dependencies = [
+ "opentelemetry",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-serde"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
 dependencies = [
- "serde 1.0.123",
+ "serde 1.0.125",
 "tracing-core",
 ]

@@ -2420,7 +2480,7 @@ dependencies = [
 "lazy_static",
 "matchers",
 "regex",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "sharded-slab",
 "smallvec",
@@ -2433,12 +2493,12 @@ dependencies = [

 [[package]]
 name = "trust-dns-proto"
-version = "0.19.6"
+version = "0.19.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b"
+checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9"
 dependencies = [
 "async-trait",
- "backtrace",
+ "cfg-if 1.0.0",
 "enum-as-inner",
 "futures",
 "idna",
@@ -2453,11 +2513,10 @@ dependencies = [

 [[package]]
 name = "trust-dns-resolver"
-version = "0.19.6"
+version = "0.19.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e"
+checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb"
 dependencies = [
- "backtrace",
 "cfg-if 0.1.10",
 "futures",
 "ipconfig",
@@ -2557,17 +2616,17 @@ checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"

 [[package]]
 name = "vergen"
-version = "4.1.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7559dbf502657d16ddfdee53eea0827fc40ea7e3a53bc8b92d7317417cf9420e"
+checksum = "dfbc87f9a7a9d61b15d51d1d3547284f67b6b4f1494ce3fc5814c101f35a5183"
 dependencies = [
- "bitflags",
+ "anyhow",
 "chrono",
 "enum-iterator",
 "getset",
 "git2",
- "serde 1.0.123",
- "serde_derive",
+ "rustversion",
+ "thiserror",
 ]

 [[package]]
@@ -2605,7 +2664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
 dependencies = [
 "cfg-if 1.0.0",
- "serde 1.0.123",
+ "serde 1.0.125",
 "serde_json",
 "wasm-bindgen-macro",
 ]
@@ -2750,5 +2809,5 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
- "linked-hash-map 0.5.4",
+ "linked-hash-map",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,29 +15,35 @@ 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.10.1", features = ["toml"] }
+config = { version = "0.11.0", features = ["toml"] }
 dotenv = "0.15.0"
 futures = "0.3.13"
 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.123"
+serde = "1.0.125"
 serde_derive = "1.0.123"
-serde_json = "1.0.63"
+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-opentelemetry = "0.11.0"
 tracing-subscriber = { version = "0.2.17", features = ["registry", "env-filter"] }

 [build-dependencies]
 ructe = "0.13.0"
-vergen = { version = "4.1.0", default-features = false, features = ["git"] }
+vergen = { version = "5.1.0", default-features = false, features = ["git"] }

 [dev-dependencies]
 ructe = "0.13.0"
--- a/build.rs
+++ b/build.rs
@@ -2,11 +2,12 @@ extern crate ructe;
 extern crate vergen;

 use ructe::Ructe;
-use vergen::{gen, ConstantsFlags};
+use vergen::{vergen, Config, ShaKind};

 fn main() {
-    let flags = ConstantsFlags::SHA_SHORT;
-    gen(flags).expect("Unable to generate the cargo keys!");
+    let mut config = Config::default();
+    *config.git_mut().sha_kind_mut() = ShaKind::Short;
+    vergen(config).expect("Unable to generate static repo info");
    Ructe::from_env()
        .expect("ructe")
        .compile_templates("templates")
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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;
@@ -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)
--- a/src/main.rs
+++ b/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")
--- a/src/telemetry.rs
+++ b/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) {
--- a/tests/util/mod.rs
+++ b/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);
    };
 }
Author	SHA1	Message	Date
Valentin Brandl	5493af0c0c	Fix test initialization All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-29 16:52:31 +02:00
Valentin Brandl	56b973607c	Use correct version of opentelemetry All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-29 16:32:37 +02:00
Valentin Brandl	cbdda8a561	Use correct version of opentelemetry All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-29 16:29:41 +02:00
Valentin Brandl	6ac399a41b	Downgrade opentelemetry dependencies All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-29 15:19:11 +02:00
Valentin Brandl	35c13fa486	First step for telemetry All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-29 14:58:36 +02:00
Valentin Brandl	6570daef02	Remove macos from test matrix Some checks failed continuous-integration/drone/push Build is failing Details	2021-03-29 12:55:49 +02:00
Valentin Brandl	6ac389e3ee	Merge pull request #239 from vbrandl/dependabot/cargo/serde_json-1.0.64 Bump serde_json from 1.0.63 to 1.0.64	2021-03-29 12:55:14 +02:00
Valentin Brandl	36196975ac	Merge pull request #251 from vbrandl/dependabot/cargo/vergen-5.1.0 Bump vergen from 4.1.0 to 5.1.0	2021-03-29 12:54:28 +02:00
dependabot-preview[bot]	1dd83829b2	Bump serde_json from 1.0.63 to 1.0.64 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.63 to 1.0.64. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.63...v1.0.64) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-29 10:48:28 +00:00
dependabot-preview[bot]	1b0817bc25	Bump vergen from 4.1.0 to 5.1.0 All checks were successful continuous-integration/drone/push Build is passing Details Bumps [vergen](https://github.com/rustyhorde/vergen) from 4.1.0 to 5.1.0. - [Release notes](https://github.com/rustyhorde/vergen/releases) - [Commits](https://github.com/rustyhorde/vergen/compare/4.1.0...5.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-29 12:45:49 +02:00
Valentin Brandl	f57dc8e890	Fix vergen	2021-03-29 12:45:49 +02:00
dependabot-preview[bot]	bdda6292d2	Bump vergen from 4.1.0 to 5.1.0 Bumps [vergen](https://github.com/rustyhorde/vergen) from 4.1.0 to 5.1.0. - [Release notes](https://github.com/rustyhorde/vergen/releases) - [Commits](https://github.com/rustyhorde/vergen/compare/4.1.0...5.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-29 12:45:49 +02:00
Valentin Brandl	a2826c9922	Remove windows from test matrix Some checks failed continuous-integration/drone/push Build is failing Details	2021-03-29 12:44:55 +02:00
Valentin Brandl	3b2a368df0	Merge pull request #247 from vbrandl/dependabot/cargo/config-0.11.0 Bump config from 0.10.1 to 0.11.0	2021-03-29 12:23:55 +02:00
Valentin Brandl	8b7444bd7c	Merge pull request #253 from vbrandl/feature/refactor2 Feature/refactor2	2021-03-29 12:12:58 +02:00
Valentin Brandl	9d719e7d85	Merge pull request #252 from vbrandl/master Refactor for testability	2021-03-29 12:12:09 +02:00
Valentin Brandl	584379e047	Merge pull request #250 from vbrandl/dependabot/cargo/serde-1.0.125 Bump serde from 1.0.123 to 1.0.125	2021-03-29 12:10:50 +02:00
dependabot-preview[bot]	951124e038	Bump serde from 1.0.123 to 1.0.125 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.123 to 1.0.125. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.123...v1.0.125) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-23 04:24:16 +00:00
dependabot-preview[bot]	cba235eadf	Bump config from 0.10.1 to 0.11.0 Bumps [config](https://github.com/mehcode/config-rs) from 0.10.1 to 0.11.0. - [Release notes](https://github.com/mehcode/config-rs/releases) - [Changelog](https://github.com/mehcode/config-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mehcode/config-rs/commits/0.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-18 04:18:27 +00:00