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

[Metricbeat] Add reporting interface with error #10727

Merged
merged 14 commits into from
Mar 6, 2019
Merged

[Metricbeat] Add reporting interface with error #10727

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1f89a43
[Metricbeat] Add reporting interface with error
ruflin Feb 13, 2019
d79179b
fix tests
ruflin Feb 15, 2019
50b7c76
make hound happy
ruflin Feb 15, 2019
47ca261
address review feedback
ruflin Mar 4, 2019
3cac41b
add more code for testing purpose
ruflin Mar 5, 2019
16df488
make hound happy
ruflin Mar 5, 2019
accef70
simplify code
ruflin Mar 5, 2019
1c9a36c
make hound happy
ruflin Mar 5, 2019
c30e9d4
sort import packages
ruflin Mar 5, 2019
a5fbb48
skip ccr tests
ruflin Mar 5, 2019
c2da990
revert es cahgnes
ruflin Mar 6, 2019
5f4dce4
make data_test compatible with both interfaces
ruflin Mar 6, 2019
4ee1e12
revert es change
ruflin Mar 6, 2019
681f41a
remove not needed interface
ruflin Mar 6, 2019
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
Prev Previous commit
Next Next commit
make data_test compatible with both interfaces
  • Loading branch information
@ruflin
ruflin committed Mar 6, 2019
commit 5f4dce41ad21482140a71b9d58d5a53b2abd07cf
17 changes: 15 additions & 2 deletions metricbeat/mb/testing/data_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,21 @@ func runTest(t *testing.T, file string, module, metricSetName, url string) {
s := server(t, file, url)
defer s.Close()

metricSet := NewReportingMetricSetV2(t, getConfig(module, metricSetName, s.URL))
events, errs := ReportingFetchV2(metricSet)
metricSet := newMetricSet(t, getConfig(module, metricSetName, s.URL))

var events []mb.Event
var errs []error

switch v := metricSet.(type) {
case mb.ReportingMetricSetV2:
metricSet := NewReportingMetricSetV2(t, getConfig(module, metricSetName, s.URL))
events, errs = ReportingFetchV2(metricSet)
case mb.ReportingMetricSetV2Error:
metricSet := NewReportingMetricSetV2Error(t, getConfig(module, metricSetName, s.URL))
events, errs = ReportingFetchV2Error(metricSet)
default:
t.Fatalf("unknown type: %T", v)
}

// Gather errors to build also error events
for _, e := range errs {
Expand Down