Temporarily disable connection debugging

influxdata · May 2, 2024 · bfda300 · bfda300
1 parent 5a77acd
commit bfda300
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/plugins/inputs/modbus/configuration_request_test.go b/plugins/inputs/modbus/configuration_request_test.go
@@ -2344,7 +2344,7 @@ func TestRequestMultipleSlavesOneFail(t *testing.T) {
 	actual := acc.GetTelegrafMetrics()
 	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 	require.Len(t, acc.Errors, 1)
-	require.EqualError(t, acc.FirstError(), "slave 2: modbus: exception '11' (gateway target device failed to respond), function '131'")
+	require.ErrorContains(t, acc.FirstError(), "slave 2: modbus: exception '11' (gateway target device failed to respond)")
 }
 
 func TestRequestOptimizationShrink(t *testing.T) {

diff --git a/plugins/inputs/modbus/modbus.go b/plugins/inputs/modbus/modbus.go
@@ -272,21 +272,27 @@ func (m *Modbus) initClient() error {
 			handler := mb.NewTCPClientHandler(host + ":" + port)
 			handler.Timeout = time.Duration(m.Timeout)
 			if m.DebugConnection {
-				handler.Logger = m
+				m.Log.Warn("Connection debugging currently not supported")
+				//nolint:gocritic // We want to bring this back as soon as grid-x/modbus#86 is merged
+				// handler.Logger = m
 			}
 			m.handler = handler
 		case "RTUoverTCP":
 			handler := mb.NewRTUOverTCPClientHandler(host + ":" + port)
 			handler.Timeout = time.Duration(m.Timeout)
 			if m.DebugConnection {
-				handler.Logger = m
+				m.Log.Warn("Connection debugging currently not supported")
+				//nolint:gocritic // We want to bring this back as soon as grid-x/modbus#86 is merged
+				// handler.Logger = m
 			}
 			m.handler = handler
 		case "ASCIIoverTCP":
 			handler := mb.NewASCIIOverTCPClientHandler(host + ":" + port)
 			handler.Timeout = time.Duration(m.Timeout)
 			if m.DebugConnection {
-				handler.Logger = m
+				m.Log.Warn("Connection debugging currently not supported")
+				//nolint:gocritic // We want to bring this back as soon as grid-x/modbus#86 is merged
+				// handler.Logger = m
 			}
 			m.handler = handler
 		default:
@@ -306,7 +312,9 @@ func (m *Modbus) initClient() error {
 			handler.Parity = m.Parity
 			handler.StopBits = m.StopBits
 			if m.DebugConnection {
-				handler.Logger = m
+				m.Log.Warn("Connection debugging currently not supported")
+				//nolint:gocritic // We want to bring this back as soon as grid-x/modbus#86 is merged
+				// handler.Logger = m
 			}
 			if m.RS485 != nil {
 				handler.RS485.Enabled = true
@@ -325,7 +333,9 @@ func (m *Modbus) initClient() error {
 			handler.Parity = m.Parity
 			handler.StopBits = m.StopBits
 			if m.DebugConnection {
-				handler.Logger = m
+				m.Log.Warn("Connection debugging currently not supported")
+				//nolint:gocritic // We want to bring this back as soon as grid-x/modbus#86 is merged
+				// handler.Logger = m
 			}
 			if m.RS485 != nil {
 				handler.RS485.Enabled = true
@@ -539,11 +549,6 @@ func (m *Modbus) collectFields(acc telegraf.Accumulator, timestamp time.Time, ta
 	}
 }
 
-// Implement the logger interface of the modbus client
-func (m *Modbus) Printf(format string, v ...interface{}) {
-	m.Log.Debugf(format, v...)
-}
-
 // Add this plugin to telegraf
 func init() {
 	inputs.Add("modbus", func() telegraf.Input { return &Modbus{} })

diff --git a/plugins/inputs/modbus/modbus_test.go b/plugins/inputs/modbus/modbus_test.go
@@ -249,7 +249,7 @@ func TestRetryFailExhausted(t *testing.T) {
 
 	require.NoError(t, modbus.Gather(&acc))
 	require.Len(t, acc.Errors, 1)
-	require.EqualError(t, acc.FirstError(), "slave 1: modbus: exception '6' (server device busy), function '129'")
+	require.ErrorContains(t, acc.FirstError(), "slave 1: modbus: exception '6' (server device busy)")
 }
 
 func TestRetryFailIllegal(t *testing.T) {
@@ -292,7 +292,7 @@ func TestRetryFailIllegal(t *testing.T) {
 
 	require.NoError(t, modbus.Gather(&acc))
 	require.Len(t, acc.Errors, 1)
-	require.EqualError(t, acc.FirstError(), "slave 1: modbus: exception '1' (illegal function), function '129'")
+	require.ErrorContains(t, acc.FirstError(), "slave 1: modbus: exception '1' (illegal function)")
 	require.Equal(t, 1, counter)
 }