following the review

Author: rainbend

plugin/skywalking/plugin-skywalking_test.go

@@ -3,16 +3,50 @@ package skywalking
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"net/http"
+	"sync"
 	"testing"
 
 	"github.com/OpenFunction/functions-framework-go/framework"
 	"github.com/OpenFunction/functions-framework-go/plugin"
+	"github.com/SkyAPM/go2sky"
+	httpP "github.com/SkyAPM/go2sky/plugins/http"
+	"k8s.io/klog/v2"
 )
 
+var (
+	initHttpClientOnce sync.Once
+	client             *http.Client
+)
+
+func initHTTPClient() {
+	initHttpClientOnce.Do(func() {
+		client, _ = httpP.NewClient(go2sky.GetGlobalTracer())
+	})
+}
+
 // HelloWorld writes "Hello, World!" to the HTTP response.
 func HelloWorldWithHttp(w http.ResponseWriter, r *http.Request) error {
-	fmt.Fprint(w, "Hello, World!\n")
+	initHTTPClient()
+	// call end service
+	request, err := http.NewRequest("POST", fmt.Sprintf("%s/correlation", "http://127.0.0.1:9090"), nil)
+	if err != nil {
+		klog.Errorf("unable to create http request: %+v\n", err)
+		return err
+	}
+
+	request = request.WithContext(r.Context())
+	res, err := client.Do(request)
+	if err != nil {
+		return err
+	}
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	fmt.Fprint(w, string(body))
 	return nil
 }
 
@@ -37,14 +71,15 @@ func TestHTTP(t *testing.T) {
       "tag2": "value2"
     },
     "baggage": {
-      "key": "sw8-correlation",
-      "value": "base64(string key):base64(string value),base64(string key2):base64(string value2)"
+      "key": "CONSUMER_KEY",
+      "value": "test"
     }
   }
 }
 `)
-	t.Setenv("POD_NAME", "prometheus-node-exporter-vhct4")
+	t.Setenv("POD_NAME", "function-test-vhct4")
 	t.Setenv("POD_NAMESPACE", "test")
+	t.Setenv("SW_AGENT_COLLECTOR_GET_AGENT_DYNAMIC_CONFIG_INTERVAL", "-1")
 	ctx := context.Background()
 	fwk, err := framework.NewFramework()
 	if err != nil {

plugin/skywalking/sync-request.go

@@ -1,7 +1,6 @@
 package skywalking
 
 import (
-	"fmt"
 	"time"
 
 	ofctx "github.com/OpenFunction/functions-framework-go/context"
@@ -21,7 +20,7 @@ func preSyncRequestLogic(ofCtx *ofctx.Context, tracer *go2sky.Tracer) error {
 
 	span.SetComponent(5004)
 	span.Tag(go2sky.TagHTTPMethod, request.Method)
-	span.Tag(go2sky.TagURL, fmt.Sprintf("%s%s", request.Host, request.URL.Path))
+	span.Tag(go2sky.TagURL, request.URL.String())
 	setPublicAttrs(nCtx, ofCtx, span)
 	return nil
 }
@@ -32,14 +31,13 @@ func postSyncRequestLogic(ctx *ofctx.Context) error {
 	if span == nil {
 		return nil
 	}
+	defer span.End()
 	if ofctx.InternalError == ctx.Out.Code {
 		span.Error(time.Now(), "Error on handling request")
 	}
 
 	if ctx.Error != nil {
 		span.Error(time.Now(), ctx.Error.Error())
 	}
-
-	span.End()
 	return nil
 }

runtime/knative/knative.go

@@ -99,7 +99,7 @@ func (r *Runtime) RegisterHTTPFunction(
 
 		rm.ProcessPreHooks()
 
-		rm.FuncContext.Error = fn(w, r)
+		rm.FuncContext.Error = fn(*rm.FuncContext.SyncRequestMeta.ResponseWriter, rm.FuncContext.SyncRequestMeta.Request)
 
 		rm.ProcessPostHooks()