Fix tests

Signed-off-by: Julien Pivotto <[email protected]>

Author: Julien Pivotto

prober/dns.go

@@ -209,17 +209,13 @@ func ProbeDNS(ctx context.Context, target string, module config.Module, registry
 		}
 	}
 
-	idnTarget, err := internationalizeDNSTarget(logger, module.DNS.QueryName)
-	if err != nil {
-		level.Error(logger).Log("msg", "IDN conversion failed", "err", err)
-		return false
-	}
+	queryName := internationalizeDNSDomain(logger, module.DNS.QueryName)
 
 	msg := new(dns.Msg)
 	msg.Id = dns.Id()
 	msg.RecursionDesired = true
 	msg.Question = make([]dns.Question, 1)
-	msg.Question[0] = dns.Question{dns.Fqdn(idnTarget), qt, qc}
+	msg.Question[0] = dns.Question{dns.Fqdn(queryName), qt, qc}
 	level.Info(logger).Log("msg", "Making DNS query", "target", target, "dial_protocol", dialProtocol, "query", module.DNS.QueryName, "type", qt, "class", qc)
 	timeoutDeadline, _ := ctx.Deadline()
 	client.Timeout = time.Until(timeoutDeadline)

prober/utils.go

@@ -56,11 +56,7 @@ func chooseProtocol(ctx context.Context, IPProtocol string, fallbackIPProtocol b
 		fallbackProtocol = "ip6"
 	}
 
-	target, err = internationalizeDNSTarget(logger, target)
-	if err != nil {
-		level.Error(logger).Log("msg", "IDN conversion failed", "err", err)
-		return nil, 0.0, err
-	}
+	target = internationalizeDNSDomain(logger, target)
 
 	level.Info(logger).Log("msg", "Resolving target address", "ip_protocol", IPProtocol)
 	resolveStart := time.Now()
@@ -127,13 +123,13 @@ func ipHash(ip net.IP) float64 {
 	return float64(h.Sum32())
 }
 
-func internationalizeDNSTarget(logger log.Logger, target string) (string, error) {
-	idnaTarget, err := idna.Lookup.ToASCII(target)
+func internationalizeDNSDomain(logger log.Logger, domain string) string {
+	idnaDomain, err := idna.Lookup.ToASCII(domain)
 	if err != nil {
-		return target, fmt.Errorf("error while internationalizing target: %w", err)
+		return domain
 	}
-	if idnaTarget != target {
-		level.Info(logger).Log("msg", "Target address internationalized", "ascii", idnaTarget)
+	if idnaDomain != domain {
+		level.Info(logger).Log("msg", "Domain internationalized", "unicode", domain, "ascii", idnaDomain)
 	}
-	return idnaTarget, nil
+	return idnaDomain
 }