Skip to content

Commit

Permalink
chore(deps): bump Jaeger and add Docker image (#720)
Browse files Browse the repository at this point in the history
* Bump jaeger and add docker image

* Update docker/docker-compose.yml

Co-authored-by: Jochen Görtler <grtlr@users.noreply.github.com>
  • Loading branch information
DaughterOfMars and grtlr committed Sep 22, 2022
1 parent 692e6c4 commit ef1c4c2
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 31 deletions.
80 changes: 54 additions & 26 deletions Cargo.lock

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

7 changes: 3 additions & 4 deletions Cargo.toml
Expand Up @@ -75,16 +75,15 @@ tonic = { version = "0.8", default-features = false, optional = true }
metrics = { version = "0.20.0", default-features = false }
metrics-exporter-prometheus = { version = "0.11.0", default-features = false, features = [ "http-listener", "tokio" ] }
metrics-util = { version = "0.14.0", default-features = false }
opentelemetry = { version = "0.17", default-features = false, features = ["trace", "rt-tokio"], optional = true }
opentelemetry-jaeger = { version = "0.16", default-features = false, features = ["rt-tokio"], optional = true }
tracing-opentelemetry = { version = "0.17", default-features = false, features = ["tracing-log"], optional = true }
opentelemetry = { version = "0.18", default-features = false, features = ["trace", "rt-tokio"], optional = true }
opentelemetry-jaeger = { version = "0.17", default-features = false, features = ["rt-tokio"], optional = true }
tracing-opentelemetry = { version = "0.18", default-features = false, features = ["tracing-log"], optional = true }

# Stardust types
bee-api-types-stardust = { package = "bee-api-types", version = "1.0.0-beta.7", default-features = false, features = ["axum"], optional = true }
bee-block-stardust = { package = "bee-block", version = "1.0.0-beta.7", default-features = false, features = [ "dto", "std", "serde" ], optional = true }

[dev-dependencies]
packable = { version = "=0.6.1", default-features = false }
rand = { version = "0.8", default-features = false, features = [ "std" ] }

[features]
Expand Down
13 changes: 13 additions & 0 deletions docker/docker-compose.yml
Expand Up @@ -137,3 +137,16 @@ services:
- ./assets/grafana/:/etc/grafana/provisioning/
environment:
- GF_INSTALL_PLUGINS=yesoreyeram-infinity-datasource

jaeger:
image: jaegertracing/all-in-one:latest
profiles:
- metrics
container_name: jaeger
restart: unless-stopped
user: "65532"
ports:
- 6831:6831/udp # accept jaeger.thrift over compact thrift protocol
- 6832:6832/udp # accept jaeger.thrift over binary thrift protocol
- 5778:5778 # serve configs
- 16686:16686 # serve frontend
2 changes: 1 addition & 1 deletion src/bin/inx-chronicle/main.rs
Expand Up @@ -39,7 +39,7 @@ fn set_up_logging() {
{
use tracing_subscriber::prelude::*;

let tracer = opentelemetry_jaeger::new_pipeline()
let tracer = opentelemetry_jaeger::new_agent_pipeline()
.with_service_name("Chronicle")
.install_batch(opentelemetry::runtime::Tokio)
.unwrap();
Expand Down

0 comments on commit ef1c4c2

Please sign in to comment.