go.d whoisquery: use Domain.ExpirationDateInTime if provided (#17926)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/whoisquery/provider.go b/src/go/collectors/go.d.plugin/modules/whoisquery/provider.go
index 6e6917bc8c..f6164da7ca 100644
--- a/src/go/collectors/go.d.plugin/modules/whoisquery/provider.go
+++ b/src/go/collectors/go.d.plugin/modules/whoisquery/provider.go
@@ -66,10 +66,14 @@ func (c *whoisClient) queryWhoisInfo() (*whoisparser.WhoisInfo, error) {
 }
 
 func parseWhoisInfoExpirationDate(info *whoisparser.WhoisInfo) (float64, error) {
-	if info == nil {
+	if info == nil || info.Domain == nil {
 		return 0, errors.New("nil Whois Info")
 	}
 
+	if info.Domain.ExpirationDateInTime != nil {
+		return time.Until(*info.Domain.ExpirationDateInTime).Seconds(), nil
+	}
+
 	date := info.Domain.ExpirationDate
 	if date == "" {
 		return 0, errors.New("no expiration date")