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

Snmpreceiver fix counter64 #26368

Merged
27 changes: 27 additions & 0 deletions .chloggen/snmpreceiver-add-counter64.yaml
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 2 additions & 0 deletions receiver/snmpreceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions receiver/snmpreceiver/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change this too?

Copy link
Contributor Author

@technimad-splunk technimad-splunk Sep 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a test for an invalid data type.
If we receive an invalid or unsopported data type an error should be raised.

With this PR, uint64 becomes supported, and no error is raised anymore, causing the test to fail.
This change tests for an other, yet unsupported, data type (float64) which should generate an error.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, missed the context. Thanks for explaining.

Name: "1",
Type: gosnmp.Counter64,
}
Expand Down Expand Up @@ -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,
}
Expand Down