update tests as per changes

pkg/output/output.go

@@ -308,7 +308,7 @@ type JSONLogRequest struct {
 	Input    string      `json:"input"`
 	Address  string      `json:"address"`
 	Error    string      `json:"error"`
-	Kind     string      `json:"kind"`
+	Kind     string      `json:"kind,omitempty"`
 	Attrs    interface{} `json:"attrs,omitempty"`
 }
 
@@ -321,7 +321,6 @@ func (w *StandardWriter) Request(templatePath, input, requestType string, reques
 		Template: templatePath,
 		Input:    input,
 		Type:     requestType,
-		Kind:     errkit.ErrKindUnknown.String(),
 	}
 	parsed, _ := urlutil.ParseAbsoluteURL(input, false)
 	if parsed != nil {
@@ -341,6 +340,7 @@ func (w *StandardWriter) Request(templatePath, input, requestType string, reques
 	if errX == nil {
 		request.Error = "none"
 	} else {
+		request.Kind = errkit.ErrKindUnknown.String()
 		var cause error
 		if len(errX.Errors()) > 1 {
 			cause = errX.Errors()[0]

pkg/output/output_test.go

@@ -30,7 +30,7 @@ func TestStandardWriterRequest(t *testing.T) {
 		require.NoError(t, err)
 		w.Request("path", "input", "http", nil)
 
-		require.Equal(t, `{"template":"path","input":"input","error":"none","type":"http"}`, traceWriter.String())
+		require.Equal(t, `{"template":"path","type":"http","input":"input","address":"input:","error":"none"}`, traceWriter.String())
 		require.Empty(t, errorWriter.String())
 	})
 
@@ -47,7 +47,7 @@ func TestStandardWriterRequest(t *testing.T) {
 			fmt.Errorf("GET https://example.com/tcpconfig.html/tcpconfig.html giving up after 2 attempts: %w", errors.New("context deadline exceeded (Client.Timeout exceeded while awaiting headers)")),
 		)
 
-		require.Equal(t, `{"template":"misconfiguration/tcpconfig.yaml","input":"https://example.com/tcpconfig.html","error":"context deadline exceeded (Client.Timeout exceeded while awaiting headers)","type":"http"}`, errorWriter.String())
+		require.Equal(t, `{"template":"misconfiguration/tcpconfig.yaml","type":"http","input":"https://example.com/tcpconfig.html","address":"example.com:443","error":"context deadline exceeded (Client.Timeout exceeded while awaiting headers)","kind":"unknown-error"}`, errorWriter.String())
 	})
 }
 

pkg/protocols/common/contextargs/metainput.go

@@ -67,7 +67,6 @@ func (metaInput *MetaInput) Address() string {
 	var hostname, port string
 	target, err := urlutil.ParseAbsoluteURL(metaInput.Target(), false)
 	if err != nil {
-		err = nil
 		if metaInput.CustomIP == "" {
 			// since this is used in hosterrorscache we add a random id
 			// which will never be used to avoid skipping valid targets

pkg/protocols/common/hosterrorscache/hosterrorscache_test.go

@@ -75,15 +75,17 @@ func TestCacheMarkFailed(t *testing.T) {
 
 	tests := []struct {
 		host     string
-		expected int
+		expected int32
 	}{
 		{"http://example.com:80", 1},
 		{"example.com:80", 2},
-		{"example.com", 1},
+		// earlier if port is not provided then port was omitted
+		// but from now it will default to appropriate http scheme based port with 80 as default
+		{"example.com:443", 1},
 	}
 
 	for _, test := range tests {
-		normalizedCacheValue := cache.normalizeCacheValue(test.host)
+		normalizedCacheValue := cache.GetKeyFromContext(newCtxArgs(test.host), nil)
 		cache.MarkFailed(newCtxArgs(test.host), fmt.Errorf("no address found for host"))
 		failedTarget, err := cache.failedTargets.Get(normalizedCacheValue)
 		require.Nil(t, err)
@@ -104,7 +106,7 @@ func TestCacheMarkFailedConcurrent(t *testing.T) {
 	}{
 		{"http://example.com:80", 200},
 		{"example.com:80", 200},
-		{"example.com", 100},
+		{"example.com:443", 100},
 	}
 
 	// the cache is not atomic during items creation, so we pre-create them with counter to zero