fix CI errors

Author: rakshil14-2

awscrt/mqtt.py

@@ -334,7 +334,7 @@ class Connection(NativeResource):
 
         enable_metrics (bool): Enable IoT SDK metrics in MQTT CONNECT packet username field, including SDK name, version, and platform. Default to True.
 
-        metrics (Optional[AWSIoTMetrics]) :  Optional metrics configuration for IoT SDK metrics reporting. If provided, the CRT will use the given metrics. If None, a default AWSIoTMetrics will be created.
+        metrics (Optional[:class: `AWSIoTMetrics`]) :  Optional metrics configuration for IoT SDK metrics reporting. If provided, the CRT will use the given metrics. If None, a default AWSIoTMetrics will be created.
         """
 
     def __init__(self,

awscrt/mqtt5.py

@@ -1372,7 +1372,7 @@ class ClientOptions:
         on_lifecycle_event_connection_failure_fn (Callable[[LifecycleConnectFailureData],]): Callback for Lifecycle Event Connection Failure.
         on_lifecycle_event_disconnection_fn (Callable[[LifecycleDisconnectData],]): Callback for Lifecycle Event Disconnection.
         enable_metrics (bool): Enable IoT SDK metrics in MQTT CONNECT packet username field, including SDK name, version, and platform. Default to True.
-        metrics (Optional[AWSIoTMetrics]) :  Optional metrics configuration for IoT SDK metrics reporting. If provided, the CRT will use the given metrics. If None, a default AWSIoTMetrics will be created.
+        metrics (Optional[:class: `AWSIoTMetrics`]) :  Optional metrics configuration for IoT SDK metrics reporting. If provided, the CRT will use the given metrics. If None, a default AWSIoTMetrics will be created.
 
     """
     host_name: str

source/mqtt5_client.c

@@ -974,6 +974,9 @@ PyObject *aws_py_mqtt5_client_new(PyObject *self, PyObject *args) {
     AWS_ZERO_STRUCT(tls_options);
     struct aws_mqtt5_user_property *user_properties_tmp = NULL;
     struct aws_mqtt5_user_property *will_user_properties_tmp = NULL;
+    struct aws_mqtt_metadata_entry *metadata_entries = NULL;
+    PyObject *library_name_py = NULL;
+    PyObject *metadata_entries_py = NULL;
 
     struct aws_mqtt5_client_options client_options;
     AWS_ZERO_STRUCT(client_options);
@@ -1320,9 +1323,7 @@ PyObject *aws_py_mqtt5_client_new(PyObject *self, PyObject *args) {
     /* METRICS */
     struct aws_mqtt_iot_metrics metrics_tmp;
     AWS_ZERO_STRUCT(metrics_tmp);
-    struct aws_mqtt_metadata_entry *metadata_entries = NULL;
-    PyObject *library_name_py = NULL;
-    PyObject *metadata_entries_py = NULL;
+
     if (PyObject_IsTrue(is_metrics_enabled_py) && metrics_py != Py_None) {
         library_name_py = PyObject_GetAttrString(metrics_py, "library_name");
         metrics_tmp.library_name = aws_byte_cursor_from_pyunicode(library_name_py);

source/mqtt_client_connection.c

@@ -447,16 +447,20 @@ static bool s_set_metrics(struct aws_mqtt_client_connection *connection, PyObjec
 
     bool success = false;
 
+    struct aws_mqtt_iot_metrics metrics_tmp;
+    AWS_ZERO_STRUCT(metrics_tmp);
+    PyObject *metadata_entries_py = NULL;
+    struct aws_mqtt_metadata_entry *metadata_entries = NULL;
+    size_t metadata_count = 0;
+
     PyObject *library_name_py = PyObject_GetAttrString(metrics, "library_name");
-    struct aws_byte_cursor library_name = aws_byte_cursor_from_pyunicode(library_name_py);
-    if (!library_name.ptr) {
+    metrics_tmp.library_name = aws_byte_cursor_from_pyunicode(library_name_py);
+    if (!metrics_tmp.library_name.ptr) {
         PyErr_SetString(PyExc_TypeError, "metrics.library_name must be str type");
         goto done;
     }
 
-    PyObject *metadata_entries_py = PyObject_GetAttrString(metrics, "metadata_entries");
-    struct aws_mqtt_metadata_entry *metadata_entries = NULL;
-    size_t metadata_count = 0;
+    metadata_entries_py = PyObject_GetAttrString(metrics, "metadata_entries");
 
     if (metadata_entries_py && metadata_entries_py != Py_None && PyList_Check(metadata_entries_py)) {
         Py_ssize_t count = PyList_Size(metadata_entries_py);
@@ -488,13 +492,10 @@ static bool s_set_metrics(struct aws_mqtt_client_connection *connection, PyObjec
         }
     }
 
-    struct aws_mqtt_iot_metrics metrics_struct = {
-        .library_name = library_name,
-        .metadata_count = metadata_count,
-        .metadata_entries = metadata_entries,
-    };
+    metrics_tmp.metadata_count = metadata_count;
+    metrics_tmp.metadata_entries = metadata_entries;
 
-    if (aws_mqtt_client_connection_set_metrics(connection, &metrics_struct)) {
+    if (aws_mqtt_client_connection_set_metrics(connection, &metrics_tmp)) {
         PyErr_SetAwsLastError();
         goto done;
     }