From e6e5f54e405ffba041ab01e6dbfd1b3ac6ccdee2 Mon Sep 17 00:00:00 2001 From: Erwin Vrolijk <122808896+technimad-splunk@users.noreply.github.com> Date: Tue, 5 Sep 2023 17:17:40 +0200 Subject: [PATCH] Snmpreceiver fix counter64 (#26368) --- .chloggen/snmpreceiver-add-counter64.yaml | 27 +++++++++++++++++++++++ receiver/snmpreceiver/client.go | 2 ++ receiver/snmpreceiver/client_test.go | 4 ++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100755 .chloggen/snmpreceiver-add-counter64.yaml diff --git a/.chloggen/snmpreceiver-add-counter64.yaml b/.chloggen/snmpreceiver-add-counter64.yaml new file mode 100755 index 000000000000..859605d68415 --- /dev/null +++ b/.chloggen/snmpreceiver-add-counter64.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: snmpreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: SNMP values of type Counter64 were seen as unsupported, because the returned data type unint64 was unhandeled. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [23897,26119] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] diff --git a/receiver/snmpreceiver/client.go b/receiver/snmpreceiver/client.go index 1b7e55eee9c6..33ab9f60b041 100644 --- a/receiver/snmpreceiver/client.go +++ b/receiver/snmpreceiver/client.go @@ -392,6 +392,8 @@ func (c snmpClient) toInt64(name string, value interface{}) (int64, error) { return int64(value), nil case uint32: return int64(value), nil + case uint64: + return int64(value), nil default: return 0, fmt.Errorf("incompatible type while converting OID '%s' data to int64", name) } diff --git a/receiver/snmpreceiver/client_test.go b/receiver/snmpreceiver/client_test.go index 66b13993e31f..491b20d9a2d9 100644 --- a/receiver/snmpreceiver/client_test.go +++ b/receiver/snmpreceiver/client_test.go @@ -513,7 +513,7 @@ func TestGetScalarData(t *testing.T) { expectedSNMPData := []SNMPData{} mockGoSNMP := new(mocks.MockGoSNMPWrapper) pdu1 := gosnmp.SnmpPDU{ - Value: uint64(math.MaxUint64), + Value: float64(math.MaxFloat64), Name: "1", Type: gosnmp.Counter64, } @@ -883,7 +883,7 @@ func TestGetIndexedData(t *testing.T) { mockGoSNMP := new(mocks.MockGoSNMPWrapper) mockGoSNMP.On("GetVersion", mock.Anything).Return(gosnmp.Version2c) pdu := gosnmp.SnmpPDU{ - Value: uint64(math.MaxUint64), + Value: float64(math.MaxFloat64), Name: "1.1", Type: gosnmp.Counter64, }