Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(inputs/snmp): switch new Reconnect method to be a value receiver #11197

Merged
merged 1 commit into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/snmp/wrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (gs *GosnmpWrapper) SetAgent(agent string) error {
return nil
}

func (gs *GosnmpWrapper) Reconnect() error {
func (gs GosnmpWrapper) Reconnect() error {
if gs.Conn == nil {
return gs.Connect()
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/inputs/snmp/snmp.go
Original file line number Diff line number Diff line change
Expand Up @@ -590,13 +590,13 @@ func (s *Snmp) getConnection(idx int) (snmpConnection, error) {
return nil, err
}

s.connectionCache[idx] = &gs
s.connectionCache[idx] = gs

if err := gs.Connect(); err != nil {
return nil, fmt.Errorf("setting up connection: %w", err)
}

return &gs, nil
return gs, nil
}

// fieldConvert converts from any type according to the conv specification
Expand Down
12 changes: 6 additions & 6 deletions plugins/inputs/snmp/snmp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func TestGetSNMPConnection_v2(t *testing.T) {

gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(*snmp.GosnmpWrapper)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "1.2.3.4", gs.Target)
assert.EqualValues(t, 567, gs.Port)
assert.Equal(t, gosnmp.Version2c, gs.Version)
Expand All @@ -273,14 +273,14 @@ func TestGetSNMPConnection_v2(t *testing.T) {

gsc, err = s.getConnection(1)
require.NoError(t, err)
gs = gsc.(*snmp.GosnmpWrapper)
gs = gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "1.2.3.4", gs.Target)
assert.EqualValues(t, 161, gs.Port)
assert.Equal(t, "udp", gs.Transport)

gsc, err = s.getConnection(2)
require.NoError(t, err)
gs = gsc.(*snmp.GosnmpWrapper)
gs = gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "127.0.0.1", gs.Target)
assert.EqualValues(t, 161, gs.Port)
assert.Equal(t, "udp", gs.Transport)
Expand All @@ -304,7 +304,7 @@ func TestGetSNMPConnectionTCP(t *testing.T) {
wg.Add(1)
gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(*snmp.GosnmpWrapper)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "127.0.0.1", gs.Target)
assert.EqualValues(t, 56789, gs.Port)
assert.Equal(t, "tcp", gs.Transport)
Expand Down Expand Up @@ -351,7 +351,7 @@ func TestGetSNMPConnection_v3(t *testing.T) {

gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(*snmp.GosnmpWrapper)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, gs.Version, gosnmp.Version3)
sp := gs.SecurityParameters.(*gosnmp.UsmSecurityParameters)
assert.Equal(t, "1.2.3.4", gsc.Host())
Expand Down Expand Up @@ -472,7 +472,7 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {

gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(*snmp.GosnmpWrapper)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, gs.Version, gosnmp.Version3)
sp := gs.SecurityParameters.(*gosnmp.UsmSecurityParameters)
assert.Equal(t, "1.2.3.4", gsc.Host())
Expand Down
6 changes: 3 additions & 3 deletions plugins/processors/ifname/ifname.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ func (d *IfName) getMapRemoteNoMock(agent string) (nameMap, error) {
//try ifXtable and ifName first. if that fails, fall back to
//ifTable and ifDescr
var m nameMap
if m, err = d.buildMap(&gs, d.ifXTable); err == nil {
if m, err = d.buildMap(gs, d.ifXTable); err == nil {
return m, nil
}

if m, err = d.buildMap(&gs, d.ifTable); err == nil {
if m, err = d.buildMap(gs, d.ifTable); err == nil {
return m, nil
}

Expand Down Expand Up @@ -308,7 +308,7 @@ func (d *IfName) makeTableNoMock(oid string) (*si.Table, error) {
return &tab, nil
}

func (d *IfName) buildMap(gs *snmp.GosnmpWrapper, tab *si.Table) (nameMap, error) {
func (d *IfName) buildMap(gs snmp.GosnmpWrapper, tab *si.Table) (nameMap, error) {
var err error

rtab, err := tab.Build(gs, true, d.translator)
Expand Down
2 changes: 1 addition & 1 deletion plugins/processors/ifname/ifname_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestTable(t *testing.T) {
require.NoError(t, err)

// Could use ifIndex but oid index is always the same
m, err := d.buildMap(&gs, tab)
m, err := d.buildMap(gs, tab)
require.NoError(t, err)
require.NotEmpty(t, m)
}
Expand Down