Merge pull request #427 from chronicleworks/fix/import-syntax

* Dependency refresh

Cargo.toml

@@ -21,8 +21,8 @@ members = [
 Inflector = "0.11.4"
 anyhow = "1.0.6"
 assert_fs = "1.0"
-async-graphql = "5.0.6"
-async-graphql-poem = "5.0.6"
+async-graphql = "^5.0.6"
+async-graphql-poem = "^5.0.6"
 async-stream = "0.3.3"
 async-trait = "0.1.61"
 atty = "0.2.14"
@@ -80,7 +80,7 @@ mockito = "1.0.2"
 oauth2 = "4.4"
 opa = "0.9.0"
 openssl = "0.10.55"
-opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
+opentelemetry = { version = "^0.19.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.17.0", features = [
   "rt-tokio",
   "reqwest_collector_client",

charts/chronicle/values.yaml

@@ -46,7 +46,7 @@ startUpProbe:
   ## @md | `startUpProbe.periodSeconds` | how often (in seconds) to perform the probe | 10 |
   periodSeconds: 10
   ## @md | `startUpProbe.timeoutSeconds` | number of seconds after which the probe times out | 3 |
-  timeoutSeconds: 3
+  timeoutSeconds: 30
   ## @md | `startUpProbe.namespaceName` | the Chronicle namespace in which the probe operates | default |
   namespaceName: default
   ## @md | `startUpProbe.namespaceUuid` | the UUID of the Chronicle namespace in which the probe operates | fd717fd6-70f1-44c1-81de-287d5e101089 |

crates/api/src/chronicle_graphql/mod.rs

@@ -4,6 +4,8 @@ use async_graphql::{
     scalar, Context, Enum, Error, ErrorExtensions, Object, ObjectType, Schema, ServerError,
     SimpleObject, Subscription, SubscriptionType,
 };
+
+
 use async_graphql_poem::{
     GraphQL, GraphQLBatchRequest, GraphQLBatchResponse, GraphQLProtocol, GraphQLSubscription,
     GraphQLWebSocket,

crates/api/src/lib.rs

@@ -1837,6 +1837,7 @@ mod test {
     use opa_tp_protocol::state::{policy_address, policy_meta_address, PolicyMeta};
     use rand_core::SeedableRng;
     use sawtooth_sdk::messages::setting::{Setting, Setting_Entry};
+    use tracing::info;
 
     use std::{collections::HashMap, time::Duration};
     use tempfile::TempDir;
@@ -1860,6 +1861,7 @@ mod test {
                     // Recv until we get a commit notification
                     loop {
                         let commit = self.api.notify_commit.subscribe().recv().await.unwrap();
+                        info!(wait_for_commit = ?commit);
                         match commit {
                             common::ledger::SubmissionStage::Submitted(Ok(_)) => continue,
                             common::ledger::SubmissionStage::Committed(commit, _id) => {

crates/async-sawtooth-sdk/src/zmq_client.rs

@@ -231,19 +231,34 @@ impl RequestResponseSawtoothChannel for ZmqRequestResponseSawtoothChannel {
                     Ok((channel, Ok(Ok(response))))
                         if response.message_type == Message_MessageType::PING_REQUEST =>
                     {
-                        trace!(ping_request = ?response.correlation_id);
+                        debug!(ping_request = ?response.correlation_id);
                         let ping_reply = PingResponse::default().encode_to_vec();
-                        channel
-                            .tx
-                            .lock()
-                            .unwrap()
-                            .send(
-                                Message_MessageType::PING_RESPONSE,
-                                &response.correlation_id,
-                                &ping_reply,
-                            )
-                            .map_err(|e| error!(send_ping_reply = ?e))
-                            .ok();
+                        let tx_guard = channel.tx.lock().expect("Failed to lock tx for sending");
+                        let ping_response_result = tx_guard.send(
+                            Message_MessageType::PING_RESPONSE,
+                            &response.correlation_id,
+                            &ping_reply,
+                        );
+
+                        if let Err(e) = ping_response_result {
+                            error!(send_ping_reply = ?e);
+                        }
+
+                        let new_uuid = uuid::Uuid::new_v4().to_string();
+                        let ping_request_result = tx_guard.send(
+                            Message_MessageType::PING_REQUEST,
+                            &new_uuid,
+                            &ping_reply,
+                        );
+
+                        if let Err(e) = ping_request_result {
+                            error!(send_ping_request = ?e);
+                        }
+                    }
+                    Ok((_channel, Ok(Ok(response))))
+                        if response.message_type == Message_MessageType::PING_RESPONSE =>
+                    {
+                        debug!(ping_response = ?response.correlation_id);
                     }
                     Ok((channel, Ok(Ok(response)))) => {
                         let response = RX::parse_from_bytes(&response.content)

crates/chronicle-protocol/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "chronicle-protocol"
-version = "0.7.0"
+version = "0.7.6"
 
 [lib]
 name = "chronicle_protocol"

crates/chronicle-synth/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "chronicle-synth"
-version = "0.7.0"
+version = "0.7.6"
 
 [lib]
 name = "chronicle_synth"

crates/chronicle-telemetry/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name    = "chronicle-telemetry"
-version = "0.7.0"
+version = "0.7.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/common/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "common"
-version = "0.7.0"
+version = "0.7.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/gq-subscribe/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "gq-ws"
-version = "0.7.0"
+version = "0.7.6"
 
 [dependencies]
 anyhow = { workspace = true }

crates/id-provider/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "oauth-token"
-version = "0.7.0"
+version = "0.7.6"
 
 [dependencies]
 anyhow = { workspace = true }

crates/opa-tp-protocol/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "opa-tp-protocol"
-version = "0.7.0"
+version = "0.7.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/opa-tp/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "opa-tp"
-version = "0.7.0"
+version = "0.7.6"
 
 [lib]
 name = "opa_tp"

crates/opactl/Cargo.toml

@@ -2,7 +2,7 @@
 build   = "build.rs"
 edition = "2021"
 name    = "opactl"
-version = "0.7.0"
+version = "0.7.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/sawtooth-tp/Cargo.toml

@@ -10,7 +10,7 @@ path = "src/lib.rs"
 build   = "build.rs"
 edition = "2021"
 name    = "sawtooth_tp"
-version = "0.7.0"
+version = "0.7.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

docker/unified-builder

@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-ARG RUST_VERSION=1.68
+ARG RUST_VERSION=1.77
 FROM --platform=${BUILDPLATFORM} rust:${RUST_VERSION} as hostbase
 
 ENV PKG_CONFIG_ALLOW_CROSS=1