bug-fixing: http probe report the unsupported document type (megaease…

…#235) * bug-fixing: http probe report the unsupported doc type if not configure the * add the unit test case * add more retry for windows unit test case failed
jerrytanjunjie888 · Oct 18, 2022 · 6983ee5 · 6983ee5
1 parent 1821c1e
commit 6983ee5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/conf/merge_test.go b/conf/merge_test.go
@@ -34,7 +34,7 @@ import (
 // refer to https://github.com/golang/go/issues/51442
 // using the workaround to remove the directory by a retry loop
 func removeDir(dir string) {
-	for i := 0; i < 10; i++ {
+	for i := 0; i < 100; i++ {
 		if err := os.RemoveAll(dir); err == nil {
 			return
 		}

diff --git a/probe/http/http.go b/probe/http/http.go
@@ -164,8 +164,11 @@ func (h *HTTP) Config(gConf global.ProbeSettings) error {
 		return err
 	}
 
-	if err := h.Evaluator.Config(); err != nil {
-		return err
+	// if the evaluator is set, config it
+	if h.Evaluator.DocType != eval.Unsupported && len(strings.TrimSpace(h.Evaluator.Expression)) > 0 {
+		if err := h.Evaluator.Config(); err != nil {
+			return err
+		}
 	}
 
 	h.metrics = newMetrics(kind, tag)

diff --git a/probe/http/http_test.go b/probe/http/http_test.go
@@ -18,13 +18,15 @@
 package http
 
 import (
+	"bytes"
 	"context"
 	"crypto/tls"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
+	"os"
 	"reflect"
 	"testing"
 
@@ -33,6 +35,7 @@ import (
 	"github.com/megaease/easeprobe/global"
 	"github.com/megaease/easeprobe/probe"
 	"github.com/megaease/easeprobe/probe/base"
+	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -68,9 +71,28 @@ func createHTTP() *HTTP {
 		},
 	}
 }
+
+func createSimpleHTTP() *HTTP {
+	return &HTTP{
+		DefaultProbe:    base.DefaultProbe{ProbeName: "dummy http"},
+		URL:             "http://localhost:8888",
+		ContentEncoding: "text/json",
+		Headers:         map[string]string{"header1": "value1", "header2": "value2", "Host": "host.com"},
+		Body:            "{ \"key1\": \"value1\", \"key2\": \"value2\" }",
+	}
+}
+
 func TestHTTPConfig(t *testing.T) {
-	h := createHTTP()
+	h := createSimpleHTTP()
+	var buf bytes.Buffer
+	log.SetOutput(&buf)
 	err := h.Config(global.ProbeSettings{})
+	assert.NoError(t, err)
+	assert.NotContains(t, buf.String(), "Unsupported document type")
+	log.SetOutput(os.Stdout)
+
+	h = createHTTP()
+	err = h.Config(global.ProbeSettings{})
 	assert.Error(t, err)
 
 	//TLS config success