* Dependency refresh

* PING improvements * Update compiler version Signed-off-by: Ryan <[email protected]>
chronicleworks · Apr 30, 2024 · 5b4bfb4 · 5b4bfb4
1 parent 2d01b56
commit 5b4bfb4
Show file tree

Hide file tree

Showing 19 changed files with 1,361 additions and 934 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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",

diff --git a/charts/chronicle/templates/statefulset.yaml b/charts/chronicle/templates/statefulset.yaml
@@ -153,6 +153,106 @@ spec:
             - name: chronicle-data
               mountPath: /var/lib/chronicle/store/
             {{- include "lib.volumeMounts" .Values.extraVolumeMounts | nindent 12 }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - bash
+                - -c
+                - |
+                  PROBE_ID="liveness_$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 13)" &&
+                  TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ") &&
+                  echo '[
+                    {
+                      "@id": "_:n1",
+                      "@type": [
+                        "http://btp.works/chronicleoperations/ns#ActivityExists"
+                      ],
+                      "http://btp.works/chronicleoperations/ns#activityName": [
+                        {
+                          "@value": "'"$PROBE_ID"'"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceName": [
+                        {
+                          "@value": "{{ .Values.livenessProbe.namespaceName }}"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceUuid": [
+                        {
+                          "@value": "{{ .Values.livenessProbe.namespaceUuid }}"
+                        }
+                      ]
+                    }
+                  ]' > /tmp/import.json &&
+                  echo "Probe ID: $PROBE_ID" &&
+                  RUST_LOG=debug chronicle \
+                    -c /etc/chronicle/config/config.toml \
+                    --console-logging json \
+                    --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \
+                    --remote-database \
+                    --database-name {{ .Values.postgres.database }} \
+                    --database-username {{ .Values.postgres.user }} \
+                    --database-host {{ .Values.postgres.host }} \
+                {{- if not .Values.opa.enabled }}
+                    --embedded-opa-policy \
+                {{- end }}
+                    import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} /tmp/import.json
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.startUpProbe.enabled }}
+          startupProbe:
+            exec:
+              command:
+                - bash
+                - -c
+                - |
+                  PROBE_ID="startup_$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 13)" &&
+                  TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ") &&
+                  echo '[
+                    {
+                      "@id": "_:n1",
+                      "@type": [
+                        "http://btp.works/chronicleoperations/ns#ActivityExists"
+                      ],
+                      "http://btp.works/chronicleoperations/ns#activityName": [
+                        {
+                          "@value": "'"$PROBE_ID"'"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceName": [
+                        {
+                          "@value": "{{ .Values.startUpProbe.namespaceName }}"
+                        }
+                      ],
+                      "http://btp.works/chronicleoperations/ns#namespaceUuid": [
+                        {
+                          "@value": "{{ .Values.startUpProbe.namespaceUuid }}"
+                        }
+                      ]
+                    }
+                  ]' > /tmp/import.json &&
+                  echo "Probe ID: $PROBE_ID" &&
+                  RUST_LOG=debug chronicle \
+                    -c /etc/chronicle/config/config.toml \
+                    --console-logging json \
+                    --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \
+                    --remote-database \
+                    --database-name {{ .Values.postgres.database }} \
+                    --database-username {{ .Values.postgres.user }} \
+                    --database-host {{ .Values.postgres.host }} \
+                {{- if not .Values.opa.enabled }}
+                    --embedded-opa-policy \
+                {{- end }}
+                    import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} /tmp/import.json
+            initialDelaySeconds: {{ .Values.startUpProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startUpProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startUpProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.startUpProbe.failureThreshold }}
+          {{- end }}
       volumes:
         - name: chronicle-secrets
           persistentVolumeClaim:
@@ -163,10 +263,10 @@ spec:
         - name: chronicle-config
           configMap:
             name: {{ .Release.Name }}-chronicle-config
-{{- if not .Values.postgres.persistence.enabled }}
+        {{- if not .Values.postgres.persistence.enabled }}
         - name: "pgdata"
           emptyDir: {}
-{{- end }}
+        {{- end }}
   volumeClaimTemplates:
     - metadata:
         name: chronicle-data
@@ -176,7 +276,7 @@ spec:
         resources:
           requests:
             storage: 6Gi
-{{- if .Values.postgres.persistence.enabled }}
+    {{- if .Values.postgres.persistence.enabled }}
     - metadata:
         name: "pgdata"
         annotations: {{- include "lib.safeToYaml" .Values.postgres.persistence.annotations | nindent 10 }}
@@ -186,4 +286,4 @@ spec:
         resources:
           requests:
             storage: {{ .Values.postgres.persistence.size | quote }}
-{{- end }}
+    {{- end }}
diff --git a/charts/chronicle/values.yaml b/charts/chronicle/values.yaml
@@ -22,6 +22,37 @@ auth:
   userinfo:
     url:
 
+## @md | `livenessProbe.enabled` | if true, enables the liveness probe | false |
+livenessProbe:
+  enabled: false
+  ## @md | `livenessProbe.timeoutSeconds` | number of seconds after which the probe times out | 10 |
+  timeoutSeconds: 20
+  ## @md | `livenessProbe.periodSeconds` | how often (in seconds) to perform the probe | 60 |
+  periodSeconds: 60
+  ## @md | `livenessProbe.failureThreshold` | when a probe fails, Kubernetes will try failureThreshold times before giving up | 1 |
+  failureThreshold: 1
+  ## @md | `livenessProbe.namespaceName` | the Chronicle namespace in which the probe operates | default |
+  namespaceName: default
+  ## @md | `livenessProbe.namespaceUuid` | the UUID of the Chronicle namespace in which the probe operates | fd717fd6-70f1-44c1-81de-287d5e101089 |
+  namespaceUuid: fd717fd6-70f1-44c1-81de-287d5e101089
+
+## @md | `startUpProbe.enabled` | if true, enables the startup probe | true |
+startUpProbe:
+  enabled: false
+  ## @md | `startUpProbe.initialDelaySeconds` | number of seconds after which the probe starts | 5 |
+  initialDelaySeconds: 5
+  ## @md | `startUpProbe.failureThreshold` | when a probe fails, Kubernetes will try failureThreshold times before giving up | 30 |
+  failureThreshold: 30
+  ## @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
+  ## @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 |
+  namespaceUuid: fd717fd6-70f1-44c1-81de-287d5e101089
+
+
 ## @md | `backtraceLevel` | backtrace level for Chronicle  | nil |
 backtraceLevel: full
 

diff --git a/crates/api/src/chronicle_graphql/mod.rs b/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,

diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
@@ -1609,6 +1609,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;
@@ -1632,6 +1633,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) => {

diff --git a/crates/async-sawtooth-sdk/src/ledger.rs b/crates/async-sawtooth-sdk/src/ledger.rs
@@ -493,7 +493,6 @@ impl<
         }
 
         let channel = self.channel.clone();
-        let from_block = from_block;
         let event_stream = channel.recv_stream::<EventList>().await?;
         let event_stream = event_stream.then(move |events| {
             let event_type = event_type.clone();

diff --git a/crates/async-sawtooth-sdk/src/zmq_client.rs b/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)

diff --git a/crates/chronicle-protocol/Cargo.toml b/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"

diff --git a/crates/chronicle-synth/Cargo.toml b/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"

diff --git a/crates/chronicle-telemetry/Cargo.toml b/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
 

diff --git a/crates/common/Cargo.toml b/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
 

diff --git a/crates/gq-subscribe/Cargo.toml b/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 }

diff --git a/crates/id-provider/Cargo.toml b/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 }

diff --git a/crates/opa-tp-protocol/Cargo.toml b/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
 

diff --git a/crates/opa-tp/Cargo.toml b/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"

diff --git a/crates/opactl/Cargo.toml b/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
 

diff --git a/crates/sawtooth-tp/Cargo.toml b/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
 

diff --git a/docker/unified-builder b/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