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.

Sign up for GitHub

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

Jump to bottom

[receiver/nsxt] Update pdata usage to core v0.51.0 #10005

Merged
merged 2 commits into from
May 13, 2022
Merged

[receiver/nsxt] Update pdata usage to core v0.51.0 #10005

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f9c187
[receiver/nsxt] Update pdata usage to core v0.51.0
djaglowski May 13, 2022
abb29d2
Regenerate code
djaglowski May 13, 2022
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
1 change: 0 additions & 1 deletion receiver/nsxtreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.50.0
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/metric v0.30.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions receiver/nsxtreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions receiver/nsxtreceiver/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver/scrapererror"
"go.uber.org/zap"
Expand Down Expand Up @@ -66,13 +66,13 @@ const (
managerClass
)

func (s *scraper) scrape(ctx context.Context) (pdata.Metrics, error) {
func (s *scraper) scrape(ctx context.Context) (pmetric.Metrics, error) {
r, err := s.retrieve(ctx)
if err != nil {
return pmetric.NewMetrics(), err
}

colTime := pdata.NewTimestampFromTime(time.Now())
colTime := pcommon.NewTimestampFromTime(time.Now())
s.process(r, colTime)
return s.mb.Emit(), nil
}
Expand Down Expand Up @@ -186,7 +186,7 @@ func (s *scraper) retrieveNodeStats(

func (s *scraper) process(
nodes []*nodeInfo,
colTime pdata.Timestamp,
colTime pcommon.Timestamp,
) {
for _, n := range nodes {
for _, i := range n.interfaces {
Expand All @@ -196,7 +196,7 @@ func (s *scraper) process(
}
}

func (s *scraper) recordNodeInterface(colTime pdata.Timestamp, nodeProps dm.NodeProperties, i interfaceInformation) {
func (s *scraper) recordNodeInterface(colTime pcommon.Timestamp, nodeProps dm.NodeProperties, i interfaceInformation) {
s.mb.RecordNsxtNodeNetworkPacketCountDataPoint(colTime, i.stats.RxDropped, metadata.AttributeDirectionReceived, metadata.AttributePacketTypeDropped)
s.mb.RecordNsxtNodeNetworkPacketCountDataPoint(colTime, i.stats.RxErrors, metadata.AttributeDirectionReceived, metadata.AttributePacketTypeErrored)
successRxPackets := i.stats.RxPackets - i.stats.RxDropped - i.stats.RxErrors
Expand All @@ -219,7 +219,7 @@ func (s *scraper) recordNodeInterface(colTime pdata.Timestamp, nodeProps dm.Node
}

func (s *scraper) recordNode(
colTime pdata.Timestamp,
colTime pcommon.Timestamp,
info *nodeInfo,
) {
if info.stats == nil {
Expand Down
4 changes: 2 additions & 2 deletions receiver/nsxtreceiver/scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/pdata/pcommon"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden"
Expand Down Expand Up @@ -149,7 +149,7 @@ func TestScraperRecordNoStat(t *testing.T) {
componenttest.NewNopTelemetrySettings(),
)
scraper.host = componenttest.NewNopHost()
scraper.recordNode(pdata.NewTimestampFromTime(time.Now()), &nodeInfo{stats: nil})
scraper.recordNode(pcommon.NewTimestampFromTime(time.Now()), &nodeInfo{stats: nil})
}

func loadTestNodeStatus(t *testing.T, nodeID string, class nodeClass) (*dm.NodeStatus, error) {
Expand Down