From 00b445a68a0b1b34ba11c0d5e227144846623ad3 Mon Sep 17 00:00:00 2001 From: Tsiry Sandratraina Date: Wed, 3 Apr 2024 20:21:57 +0000 Subject: [PATCH] bump version code update telemetry data bump version code --- Cargo.lock | 16 ++++++++-------- crates/cli/Cargo.toml | 8 ++++---- crates/common/Cargo.toml | 6 +++--- crates/core/Cargo.toml | 4 ++-- crates/core/src/deps.rs | 16 ++++++++++++---- crates/graphql/Cargo.toml | 8 ++++---- crates/pdk/Cargo.toml | 4 ++-- crates/server/Cargo.toml | 4 ++-- crates/shared/Cargo.toml | 8 ++++---- crates/types/Cargo.toml | 2 +- sdk/typescript/deno.json | 2 +- 11 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed388aa..88855fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1872,7 +1872,7 @@ dependencies = [ [[package]] name = "fluentci-common" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "dirs 5.0.1", @@ -1886,7 +1886,7 @@ dependencies = [ [[package]] name = "fluentci-core" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "chrono", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "fluentci-engine" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "clap", @@ -1942,7 +1942,7 @@ dependencies = [ [[package]] name = "fluentci-graphql" -version = "0.1.5" +version = "0.1.6" dependencies = [ "anyhow", "async-graphql", @@ -1960,7 +1960,7 @@ dependencies = [ [[package]] name = "fluentci-pdk" -version = "0.1.3" +version = "0.1.4" dependencies = [ "extism-pdk", "fluentci-types", @@ -1969,7 +1969,7 @@ dependencies = [ [[package]] name = "fluentci-server" -version = "0.1.5" +version = "0.1.6" dependencies = [ "actix-cors", "actix-web", @@ -1986,7 +1986,7 @@ dependencies = [ [[package]] name = "fluentci-shared" -version = "0.1.0" +version = "0.1.1" dependencies = [ "extism", "extism-pdk", @@ -2000,7 +2000,7 @@ dependencies = [ [[package]] name = "fluentci-types" -version = "0.1.1" +version = "0.1.2" dependencies = [ "serde", ] diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 7c15862..e3dab8a 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,7 +8,7 @@ license = "MPL-2.0" name = "fluentci-engine" readme = "../../README.md" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.2.0" +version = "0.2.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,10 +16,10 @@ version = "0.2.0" anyhow = "1.0.81" clap = "3.2.20" extism = "1.2.0" -fluentci-core = {path = "../core", version = "0.1.4"} +fluentci-core = {path = "../core", version = "0.1.5"} fluentci-ext = {path = "../ext", version = "0.1.4"} -fluentci-server = {path = "../server", version = "0.1.5"} -fluentci-shared = {path = "../shared", version = "0.1.0"} +fluentci-server = {path = "../server", version = "0.1.6"} +fluentci-shared = {path = "../shared", version = "0.1.1"} get-port = "4.0.0" md5 = "0.7.0" regex = "1.10.3" diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index e426c61..36a6a01 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -7,16 +7,16 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-common" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.0" +version = "0.1.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = "1.0.81" dirs = "5.0.1" -fluentci-core = {path = "../core", version = "0.1.4"} +fluentci-core = {path = "../core", version = "0.1.5"} fluentci-ext = {path = "../ext", version = "0.1.4"} -fluentci-types = {path = "../types", version = "0.1.1"} +fluentci-types = {path = "../types", version = "0.1.2"} regex = "1.10.4" sha256 = "1.5.0" uuid = {version = "1.8.0", features = [ diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 3e741b5..00e47d8 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-core" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.4" +version = "0.1.5" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +16,7 @@ anyhow = "1.0.81" chrono = "0.4.35" dirs = "5.0.1" fluentci-ext = {path = "../ext", version = "0.1.4"} -fluentci-types = {path = "../types", version = "0.1.0"} +fluentci-types = {path = "../types", version = "0.1.1"} opentelemetry = {version = "0.22.0", features = ["trace", "pin-project-lite"]} opentelemetry-jaeger = "0.21.0" opentelemetry-otlp = {version = "0.15.0", features = ["http-proto", "reqwest-rustls", "reqwest-client"], default-features = false} diff --git a/crates/core/src/deps.rs b/crates/core/src/deps.rs index 934c630..fb378c9 100644 --- a/crates/core/src/deps.rs +++ b/crates/core/src/deps.rs @@ -138,7 +138,11 @@ impl Graph { } let (tx, rx) = mpsc::channel(); - let mut span = tracer.start_with_context(label.to_string(), &context); + let mut span = tracer.start_with_context( + format!("{} {}", label.to_string(), self.vertices[i].command.clone()), + &context, + ); + span.set_attribute(KeyValue::new("command", self.vertices[i].command.clone())); if self.vertices[i].label == "withWorkdir" { @@ -232,8 +236,9 @@ impl Graph { } let (tx, rx) = mpsc::channel(); let label = self.vertices[i].label.clone(); - let mut span = tracer.start(label); - span.set_attribute(KeyValue::new("command", self.vertices[i].command.clone())); + let command = self.vertices[i].command.clone(); + let mut span = tracer.start(format!("{} {}", label, command.clone())); + span.set_attribute(KeyValue::new("command", command.clone())); if self.vertices[i].label == "withWorkdir" { if !Path::new(&self.vertices[i].command).exists() { @@ -297,7 +302,10 @@ impl Graph { continue; } - let mut span = tracer.start_with_context(label.to_string(), &ctx); + let mut span = tracer.start_with_context( + format!("{} {}", label.to_string(), self.vertices[i].command.clone()), + &ctx, + ); span.set_attribute(KeyValue::new("command", self.vertices[i].command.clone())); let (tx, rx) = mpsc::channel(); match self.vertices[i].runner.post_setup(tx) { diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml index 1242c83..2bd9417 100644 --- a/crates/graphql/Cargo.toml +++ b/crates/graphql/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-graphql" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.5" +version = "0.1.6" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,10 +16,10 @@ anyhow = "1.0.80" async-graphql = "7.0.2" async-graphql-actix-web = "7.0.2" dirs = "5.0.1" -fluentci-common = {path = "../common", version = "0.1.0"} -fluentci-core = {path = "../core", version = "0.1.4"} +fluentci-common = {path = "../common", version = "0.1.1"} +fluentci-core = {path = "../core", version = "0.1.5"} fluentci-ext = {path = "../ext", version = "0.1.4"} -fluentci-types = {path = "../types", version = "0.1.0"} +fluentci-types = {path = "../types", version = "0.1.1"} regex = "1.10.3" sha256 = "1.5.0" tokio = "1.36.0" diff --git a/crates/pdk/Cargo.toml b/crates/pdk/Cargo.toml index 519457d..e722112 100644 --- a/crates/pdk/Cargo.toml +++ b/crates/pdk/Cargo.toml @@ -7,11 +7,11 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-pdk" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.3" +version = "0.1.4" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] extism-pdk = "1.1.0" -fluentci-types = {path = "../types", version = "0.1.0"} +fluentci-types = {path = "../types", version = "0.1.1"} serde = {version = "1.0.197", features = ["serde_derive", "derive"]} diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml index 7a8aa4c..fc2eb60 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-server" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.5" +version = "0.1.6" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,7 +17,7 @@ actix-web = "4.5.1" anyhow = "1.0.81" async-graphql = "7.0.2" async-graphql-actix-web = "7.0.2" -fluentci-core = {path = "../core", version = "0.1.4"} +fluentci-core = {path = "../core", version = "0.1.5"} fluentci-ext = {path = "../ext", version = "0.1.4"} fluentci-graphql = {path = "../graphql", version = "0.1.5"} mime_guess = "2.0.4" diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index 2026bd1..ce337b3 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -7,17 +7,17 @@ keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-shared" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.1.0" +version = "0.1.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] extism = "1.2.0" extism-pdk = "1.1.0" -fluentci-common = {path = "../common", version = "0.1.0"} -fluentci-core = {path = "../core", version = "0.1.4"} +fluentci-common = {path = "../common", version = "0.1.1"} +fluentci-core = {path = "../core", version = "0.1.5"} fluentci-ext = {path = "../ext", version = "0.1.4"} -fluentci-types = {path = "../types", version = "0.1.0"} +fluentci-types = {path = "../types", version = "0.1.1"} serde = {version = "1.0.197", features = ["serde_derive", "derive"]} uuid = {version = "1.8.0", features = [ "v4", diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml index 4fd624f..2700cf0 100644 --- a/crates/types/Cargo.toml +++ b/crates/types/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" keywords = ["nix", "environment", "ci", "cd", "devops"] license = "MPL-2.0" name = "fluentci-types" -version = "0.1.1" +version = "0.1.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/sdk/typescript/deno.json b/sdk/typescript/deno.json index 7a9cbce..a46b599 100644 --- a/sdk/typescript/deno.json +++ b/sdk/typescript/deno.json @@ -1,6 +1,6 @@ { "name": "@fluentci/sdk", - "version": "0.2.0", + "version": "0.2.1", "exports": { ".": "./src/client.gen.ts", "./plugin": "./src/plugin.ts"