fix:(transport/http): fix unexpected overriding behavior when return an error (#1984)

* fix:(transport/http): fix unexpected overriding behavior when return an error

* fix:(transport/http): fix broken tests

Co-authored-by: pwli0755 <lipw0755@gmial.com>

transport/http/resolver.go

@@ -79,17 +79,17 @@ func newResolver(ctx context.Context, discovery registry.Discovery, target *Targ
 		select {
 		case err := <-done:
 			if err != nil {
-				err := watcher.Stop()
+				stopErr := watcher.Stop()
-				if err != nil {
+				if stopErr != nil {
-					r.logger.Errorf("failed to http client watch stop: %v", target)
+					r.logger.Errorf("failed to http client watch stop: %v, error: %+v", target, stopErr)
 				}
 				return nil, err
 			}
 		case <-ctx.Done():
 			r.logger.Errorf("http client watch service %v reaching context deadline!", target)
-			err := watcher.Stop()
+			stopErr := watcher.Stop()
-			if err != nil {
+			if stopErr != nil {
-				r.logger.Errorf("failed to http client watch stop: %v", target)
+				r.logger.Errorf("failed to http client watch stop: %v, error: %+v", target, stopErr)
 			}
 			return nil, ctx.Err()
 		}

transport/http/resolver_test.go

@@ -77,10 +77,10 @@ type mockWatch struct {
 }
 
 func (m *mockWatch) Next() ([]*registry.ServiceInstance, error) {
-	m.count++
 	if m.count == 1 {
 		return nil, errors.New("mock test error")
 	}
+	m.count++
 	instance := &registry.ServiceInstance{
 		ID:        "1",
 		Name:      "kratos",