Upgrade dependencies and adapt the codes. (#57)

Author: jmjoy

Cargo.lock

@@ -36,28 +36,28 @@ name = "skywalking_agent"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-anyhow = { version = "1.0.68", features = ["backtrace"] }
+anyhow = { version = "1.0.69", features = ["backtrace"] }
 bincode = "1.3.3"
-chrono = "0.4.23"
+chrono = "0.4.24"
 dashmap = "5.4.0"
-futures-util = "0.3.25"
+futures-util = "0.3.27"
 hostname = "0.3.1"
-libc = "0.2.139"
-once_cell = "1.17.0"
+libc = "0.2.140"
+once_cell = "1.17.1"
 phper = "0.10.2"
-prost = "0.11.6"
-serde_json = { version = "1.0.91", features = ["preserve_order"] }
-skywalking = { version = "0.5.0", features = ["management"] }
-systemstat = "0.2.2"
-thiserror = "1.0.38"
-tokio = { version = "1.24.2", features = ["full"] }
-tokio-stream = "0.1.11"
+prost = "0.11.8"
+serde_json = { version = "1.0.94", features = ["preserve_order"] }
+skywalking = { version = "0.6.0", features = ["management"] }
+systemstat = "0.2.3"
+thiserror = "1.0.39"
+tokio = { version = "1.26.0", features = ["full"] }
+tokio-stream = "0.1.12"
 tonic = { version = "0.8.3", features = ["tls"] }
 tracing = { version = "0.1.37", features = ["attributes"] }
 tracing-subscriber = "0.3.16"
 url = "2.3.1"
 
 [dev-dependencies]
-axum = "0.6.2"
+axum = "0.6.11"
 fastcgi-client = "0.8.0"
-reqwest = { version = "0.11.13", features = ["trust-dns", "json", "stream"] }
+reqwest = { version = "0.11.14", features = ["trust-dns", "json", "stream"] }

Cargo.toml

@@ -25,10 +25,10 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-anyhow = "1.0.68"
-chrono = "0.4.23"
-clap = { version = "4.0.32", features = ["derive"] }
-serde = { version = "1.0.152", features = ["derive"] }
-tera = "1.17.1"
+anyhow = "1.0.69"
+chrono = "0.4.24"
+clap = { version = "4.1.8", features = ["derive"] }
+serde = { version = "1.0.155", features = ["derive"] }
+tera = "1.18.0"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"

scripts/Cargo.toml

@@ -158,10 +158,10 @@ impl CurlPlugin {
                     Ok(ctx.create_exit_span(url.path(), peer))
                 })?;
 
-                span.with_span_object_mut(|span| {
-                    span.component_id = COMPONENT_PHP_CURL_ID;
-                    span.add_tag("url", raw_url);
-                });
+                let mut span_object = span.span_object_mut();
+                span_object.component_id = COMPONENT_PHP_CURL_ID;
+                span_object.add_tag("url", raw_url);
+                drop(span_object);
 
                 let sw_header = RequestContext::try_with_global_ctx(request_id, |ctx| {
                     Ok(encode_propagation(ctx, url.path(), peer))
@@ -200,14 +200,13 @@ impl CurlPlugin {
                         .as_z_str()
                         .context("curl_error is not string")?
                         .to_str()?;
-                    span.with_span_object_mut(|span| {
-                        span.is_error = true;
-                        span.add_log(vec![("CURL_ERROR", curl_error)]);
-                    });
+                    let mut span_object = span.span_object_mut();
+                    span_object.is_error = true;
+                    span_object.add_log(vec![("CURL_ERROR", curl_error)]);
                 } else if http_code >= 400 {
-                    span.with_span_object_mut(|span| span.is_error = true);
+                    span.span_object_mut().is_error = true;
                 } else {
-                    span.with_span_object_mut(|span| span.is_error = false);
+                    span.span_object_mut().is_error = false;
                 }
 
                 Ok(())

src/plugin/plugin_curl.rs

@@ -308,9 +308,7 @@ fn after_hook(
     let mut span = span.downcast::<Span>().expect("Downcast to Span failed");
     if let Some(b) = return_value.as_bool() {
         if !b {
-            span.with_span_object_mut(|span| {
-                span.is_error = true;
-            });
+            span.span_object_mut().is_error = true;
 
             let this = get_this_mut(execute_data)?;
             let code = this.call(&"getResultCode".to_ascii_lowercase(), [])?;
@@ -343,21 +341,20 @@ fn create_exit_span<'a>(
         let mut span =
             ctx.create_exit_span(&format!("{}->{}", class_name, function_name), remote_peer);
 
-        span.with_span_object_mut(|obj| {
-            obj.set_span_layer(SpanLayer::Cache);
-            obj.component_id = COMPONENT_PHP_MEMCACHED_ID;
-            obj.add_tag(TAG_CACHE_TYPE, "memcache");
-
-            if let Some(cmd) = tag_info.cmd {
-                obj.add_tag(TAG_CACHE_CMD, cmd);
-            }
-            if let Some(op) = &tag_info.op {
-                obj.add_tag(TAG_CACHE_OP, op.to_string());
-            };
-            if let Some(key) = key {
-                obj.add_tag(TAG_CACHE_KEY, key)
-            }
-        });
+        let mut span_object = span.span_object_mut();
+        span_object.set_span_layer(SpanLayer::Cache);
+        span_object.component_id = COMPONENT_PHP_MEMCACHED_ID;
+        span_object.add_tag(TAG_CACHE_TYPE, "memcache");
+        if let Some(cmd) = tag_info.cmd {
+            span_object.add_tag(TAG_CACHE_CMD, cmd);
+        }
+        if let Some(op) = &tag_info.op {
+            span_object.add_tag(TAG_CACHE_OP, op.to_string());
+        };
+        if let Some(key) = key {
+            span_object.add_tag(TAG_CACHE_KEY, key)
+        }
+        drop(span_object);
 
         Ok(span)
     })

src/plugin/plugin_memcached.rs

@@ -132,11 +132,13 @@ fn create_mysqli_exit_span(
             &format!("{}->{}", class_name, function_name),
             &format!("{}:{}", info.hostname, info.port),
         );
-        span.with_span_object_mut(|obj| {
-            obj.set_span_layer(SpanLayer::Database);
-            obj.component_id = COMPONENT_PHP_MYSQLI_ID;
-            obj.add_tag("db.type", "mysql");
-        });
+
+        let mut span_object = span.span_object_mut();
+        span_object.set_span_layer(SpanLayer::Database);
+        span_object.component_id = COMPONENT_PHP_MYSQLI_ID;
+        span_object.add_tag("db.type", "mysql");
+        drop(span_object);
+
         Ok(span)
     })
 }

src/plugin/plugin_mysqli.rs

@@ -223,10 +223,9 @@ fn after_hook_when_false(this: &mut ZObj, span: &mut Span) -> crate::Result<()>
     };
     let error = get_error_info_item(info, 2)?.expect_z_str()?.to_str()?;
 
-    span.with_span_object_mut(|span| {
-        span.is_error = true;
-        span.add_log([("SQLSTATE", state), ("Error Code", code), ("Error", error)]);
-    });
+    let mut span_object = span.span_object_mut();
+    span_object.is_error = true;
+    span_object.add_log([("SQLSTATE", state), ("Error Code", code), ("Error", error)]);
 
     Ok(())
 }
@@ -252,12 +251,14 @@ fn create_exit_span_with_dsn(
     RequestContext::try_with_global_ctx(request_id, |ctx| {
         let mut span =
             ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &dsn.peer);
-        span.with_span_object_mut(|obj| {
-            obj.set_span_layer(SpanLayer::Database);
-            obj.component_id = COMPONENT_PHP_PDO_ID;
-            obj.add_tag(TAG_DB_TYPE, &dsn.db_type);
-            obj.add_tag("db.data_source", &dsn.data_source);
-        });
+
+        let mut span_object = span.span_object_mut();
+        span_object.set_span_layer(SpanLayer::Database);
+        span_object.component_id = COMPONENT_PHP_PDO_ID;
+        span_object.add_tag(TAG_DB_TYPE, &dsn.db_type);
+        span_object.add_tag("db.data_source", &dsn.data_source);
+        drop(span_object);
+
         Ok(span)
     })
 }

src/plugin/plugin_pdo.rs

@@ -222,18 +222,18 @@ impl PredisPlugin {
                     ))
                 })?;
 
-                span.with_span_object_mut(|span| {
-                    span.set_span_layer(SpanLayer::Cache);
-                    span.component_id = COMPONENT_PHP_PREDIS_ID;
-                    span.add_tag(TAG_CACHE_TYPE, "redis");
-                    span.add_tag(TAG_CACHE_CMD, cmd);
-                    if let Some(op) = op {
-                        span.add_tag(TAG_CACHE_OP, op);
-                    };
-                    if let Some(key) = key {
-                        span.add_tag(TAG_CACHE_KEY, key)
-                    }
-                });
+                let mut span_object = span.span_object_mut();
+                span_object.set_span_layer(SpanLayer::Cache);
+                span_object.component_id = COMPONENT_PHP_PREDIS_ID;
+                span_object.add_tag(TAG_CACHE_TYPE, "redis");
+                span_object.add_tag(TAG_CACHE_CMD, cmd);
+                if let Some(op) = op {
+                    span_object.add_tag(TAG_CACHE_OP, op);
+                };
+                if let Some(key) = key {
+                    span_object.add_tag(TAG_CACHE_KEY, key)
+                }
+                drop(span_object);
 
                 Ok(Box::new(span))
             }),
@@ -242,7 +242,7 @@ impl PredisPlugin {
 
                 let typ = return_value.get_type_info();
                 if typ.is_null() || typ.is_false() {
-                    span.with_span_object_mut(|span| span.is_error = true);
+                    span.span_object_mut().is_error = true;
                 }
 
                 Ok(())

src/plugin/plugin_predis.rs

@@ -260,11 +260,11 @@ impl RedisPlugin {
                     Ok(ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &addr))
                 })?;
 
-                span.with_span_object_mut(|span| {
-                    span.set_span_layer(SpanLayer::Cache);
-                    span.component_id = COMPONENT_PHP_REDIS_ID;
-                    span.add_tag(TAG_CACHE_TYPE, "redis");
-                });
+                let mut span_object = span.span_object_mut();
+                span_object.set_span_layer(SpanLayer::Cache);
+                span_object.component_id = COMPONENT_PHP_REDIS_ID;
+                span_object.add_tag(TAG_CACHE_TYPE, "redis");
+                drop(span_object);
 
                 Ok(Box::new(span))
             }),
@@ -306,21 +306,21 @@ impl RedisPlugin {
                     Ok(ctx.create_exit_span(&format!("{}->{}", class_name, function_name), &peer))
                 })?;
 
-                span.with_span_object_mut(|span| {
-                    span.set_span_layer(SpanLayer::Cache);
-                    span.component_id = COMPONENT_PHP_REDIS_ID;
-                    span.add_tag(TAG_CACHE_TYPE, "redis");
-                    span.add_tag(
-                        TAG_CACHE_CMD,
-                        *REDIS_ALL_MAPPING.get(function_name_key).unwrap(),
-                    );
-                    if let Some(op) = op {
-                        span.add_tag(TAG_CACHE_OP, op);
-                    }
-                    if let Some(key) = key {
-                        span.add_tag(TAG_CACHE_KEY, key)
-                    }
-                });
+                let mut span_object = span.span_object_mut();
+                span_object.set_span_layer(SpanLayer::Cache);
+                span_object.component_id = COMPONENT_PHP_REDIS_ID;
+                span_object.add_tag(TAG_CACHE_TYPE, "redis");
+                span_object.add_tag(
+                    TAG_CACHE_CMD,
+                    *REDIS_ALL_MAPPING.get(function_name_key).unwrap(),
+                );
+                if let Some(op) = op {
+                    span_object.add_tag(TAG_CACHE_OP, op);
+                }
+                if let Some(key) = key {
+                    span_object.add_tag(TAG_CACHE_KEY, key)
+                }
+                drop(span_object);
 
                 Ok(Box::new(span))
             }),
@@ -362,22 +362,21 @@ fn after_hook(
 
     let ex = unsafe { ZObj::try_from_mut_ptr(eg!(exception)) };
     if let Some(ex) = ex {
-        span.with_span_object_mut(|span| {
-            span.is_error = true;
+        let mut span_object = span.span_object_mut();
+        span_object.is_error = true;
 
-            let mut logs = Vec::new();
-            if let Ok(class_name) = ex.get_class().get_name().to_str() {
-                logs.push(("Exception Class", class_name.to_owned()));
-            }
-            if let Some(message) = ex.get_property("message").as_z_str() {
-                if let Ok(message) = message.to_str() {
-                    logs.push(("Exception Message", message.to_owned()));
-                }
-            }
-            if !logs.is_empty() {
-                span.add_log(logs);
+        let mut logs = Vec::new();
+        if let Ok(class_name) = ex.get_class().get_name().to_str() {
+            logs.push(("Exception Class", class_name.to_owned()));
+        }
+        if let Some(message) = ex.get_property("message").as_z_str() {
+            if let Ok(message) = message.to_str() {
+                logs.push(("Exception Message", message.to_owned()));
             }
-        });
+        }
+        if !logs.is_empty() {
+            span_object.add_log(logs);
+        }
     }
 
     Ok(())

src/plugin/plugin_redis.rs

@@ -252,11 +252,12 @@ fn create_request_context(
         Some(propagation) => ctx.create_entry_span_with_propagation(&operation_name, &propagation),
         None => ctx.create_entry_span(&operation_name),
     };
-    span.with_span_object_mut(|span| {
-        span.component_id = COMPONENT_PHP_ID;
-        span.add_tag("url", uri);
-        span.add_tag("http.method", method);
-    });
+
+    let mut span_object = span.span_object_mut();
+    span_object.component_id = COMPONENT_PHP_ID;
+    span_object.add_tag("url", uri);
+    span_object.add_tag("http.method", method);
+    drop(span_object);
 
     RequestContext::set_global(
         request_id,
@@ -277,7 +278,7 @@ fn finish_request_context(request_id: Option<i64>, status_code: i32) -> crate::R
 
     entry_span.add_tag("http.status_code", &status_code.to_string());
     if status_code >= 400 {
-        entry_span.with_span_object_mut(|span| span.is_error = true);
+        entry_span.span_object_mut().is_error = true;
     }
 
     drop(entry_span);