with header

Author: heyanlong

php_skywalking.h

@@ -48,7 +48,7 @@ extern zend_module_entry skywalking_module_entry;
 #define PHP_SKYWALKING_VERSION "4.0.0"
 
 
-#define SKY_STRCMP(s1, s2) s1 != nullptr && strcmp(s1, s2) == 0
+#define SKY_STRCMP(s1, s2) ((s1) != nullptr && strcmp(s1, s2) == 0)
 
 #define SKY_IS_SWOOLE(func_name) (SKY_STRCMP(func_name, "{closure}"))
 #define SKY_IS_HYPERF(class_name, func_name) (SKY_STRCMP(class_name, "Hyperf\\HttpServer\\Server") && SKY_STRCMP(func_name, "onRequest"))

src/cross_process_bag.cc

@@ -72,7 +72,7 @@ std::string CrossProcessBag::encode(int spanId, const std::string &peer) {
     tmp.emplace_back(Base64::encode(currentOperationName));
     tmp.emplace_back(Base64::encode(peer));
 
-    std::string header = "sw8: ";
+    std::string header;
 
     for (const auto &val:tmp) {
         header.append(val);

src/sky_curl.cc

@@ -155,7 +155,7 @@ void sky_curl_exec_handler(INTERNAL_FUNCTION_PARAMETERS) {
         span->addTag("url", url_str);
 
         std::string sw_header = segment->createHeader(span);
-        add_next_index_string(option, sw_header.c_str());
+        add_next_index_string(option, ("sw8: " + sw_header).c_str());
     }
 
     zval argv[3];

src/sky_plugin_hyperf_guzzle.cc

@@ -50,6 +50,16 @@ Span *sky_plugin_hyperf_guzzle(zend_execute_data *execute_data, const std::strin
                     span->setPeer(std::string(Z_STRVAL(host)) + ":" + std::to_string(_port));
                     span->setOperationName(Z_TYPE(path) == IS_NULL ? "/" : std::string(Z_STRVAL(path)));
                     span->addTag("url", std::string(Z_STRVAL(to_string)));
+
+                    // with header
+                    std::string header = segment->createHeader(span);
+                    zval name, value;
+                    ZVAL_STRING(&name, "sw8");
+                    ZVAL_STRING(&value, header.c_str());
+                    zend_call_method(request, Z_OBJCE_P(request), nullptr, ZEND_STRL("withheader"), nullptr, 2, &name, &value);
+                    zval_dtor(&name);
+                    zval_dtor(&value);
+
                     return span;
                 }
             }