From 5b599337a3bccade0ac8ee9d61e074e945d2fda3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Fri, 11 May 2018 17:47:38 -0700
Subject: [PATCH] Use internal.Duration for jolokia timeouts (#4136)
---
plugins/inputs/jolokia2/jolokia_agent.go | 6 +++---
plugins/inputs/jolokia2/jolokia_proxy.go | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/plugins/inputs/jolokia2/jolokia_agent.go b/plugins/inputs/jolokia2/jolokia_agent.go
index f1d58e68..30852d62 100644
--- a/plugins/inputs/jolokia2/jolokia_agent.go
+++ b/plugins/inputs/jolokia2/jolokia_agent.go
@@ -3,9 +3,9 @@ package jolokia2
import (
"fmt"
"sync"
- "time"
"github.com/influxdata/telegraf"
+ "github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/tls"
)
@@ -17,7 +17,7 @@ type JolokiaAgent struct {
URLs []string `toml:"urls"`
Username string
Password string
- ResponseTimeout time.Duration `toml:"response_timeout"`
+ ResponseTimeout internal.Duration `toml:"response_timeout"`
tls.ClientConfig
@@ -101,7 +101,7 @@ func (ja *JolokiaAgent) createClient(url string) (*Client, error) {
return NewClient(url, &ClientConfig{
Username: ja.Username,
Password: ja.Password,
- ResponseTimeout: ja.ResponseTimeout,
+ ResponseTimeout: ja.ResponseTimeout.Duration,
ClientConfig: ja.ClientConfig,
})
}
diff --git a/plugins/inputs/jolokia2/jolokia_proxy.go b/plugins/inputs/jolokia2/jolokia_proxy.go
index 40909dcc..7a921c08 100644
--- a/plugins/inputs/jolokia2/jolokia_proxy.go
+++ b/plugins/inputs/jolokia2/jolokia_proxy.go
@@ -1,9 +1,8 @@
package jolokia2
import (
- "time"
-
"github.com/influxdata/telegraf"
+ "github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/tls"
)
@@ -19,7 +18,7 @@ type JolokiaProxy struct {
Username string
Password string
- ResponseTimeout time.Duration `toml:"response_timeout"`
+ ResponseTimeout internal.Duration `toml:"response_timeout"`
tls.ClientConfig
Metrics []MetricConfig `toml:"metric"`
@@ -117,7 +116,7 @@ func (jp *JolokiaProxy) createClient() (*Client, error) {
return NewClient(jp.URL, &ClientConfig{
Username: jp.Username,
Password: jp.Password,
- ResponseTimeout: jp.ResponseTimeout,
+ ResponseTimeout: jp.ResponseTimeout.Duration,
ClientConfig: jp.ClientConfig,
ProxyConfig: proxyConfig,
})
--
GitLab