Merge pull request #184 from jmjoy/master

Fix the mistake of field entryOperationName in sw6 header.
SkyAPM · Feb 13, 2020 · df2b059 · df2b059
2 parents 095d182 + 74ff315
commit df2b059
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/skywalking.c b/skywalking.c
@@ -1281,7 +1281,26 @@ static void generate_context() {
             add_assoc_long(&SKYWALKING_G(context), "parentApplicationInstance", application_instance);
             add_assoc_long(&SKYWALKING_G(context), "entryApplicationInstance", application_instance);
             char *uri = get_page_request_uri();
-            add_assoc_string(&SKYWALKING_G(context), "entryOperationName", (uri == NULL) ? "" : uri);
+            char *path = NULL;
+            if (uri != NULL) {
+                path = (char *)emalloc(strlen(uri) + 5);
+                bzero(path, strlen(uri) + 5);
+
+                int i;
+                for(i = 0; i < strlen(uri); i++) {
+                    if (uri[i] == '?') {
+                        break;
+                    }
+                    path[i] = uri[i];
+                }
+                path[i] = '\0';
+            }
+
+            add_assoc_string(&SKYWALKING_G(context), "entryOperationName", (path == NULL) ? "" : path);
+            if (path != NULL) {
+                efree(path);
+            }
+
             add_assoc_string(&SKYWALKING_G(context), "distributedTraceId", makeTraceId);
             if(uri != NULL) {
                 efree(uri);