-
Notifications
You must be signed in to change notification settings - Fork 91
Add support for Fortio output format #168
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
Merged
Merged
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
2f4036f
Initial work on Fortio Output Format
nareddyt 2379f61
Add basic fortio proto
nareddyt 88c6812
Add some more fields
nareddyt 661038b
Remove unneeded import
nareddyt 07a6c7f
Disable validation
nareddyt 9abb017
More fields
nareddyt f39f726
More fields
nareddyt 3336bf3
Fix nullptr
nareddyt 79f023a
Fill in all the top-level fields and verified output is correct
nareddyt ff250a9
Delete some data that is not used anymore
nareddyt eaeca56
Fix insertion + exception
nareddyt 2c19e11
Remove some more fields that are not needed
nareddyt a3b864d
Cleanup
nareddyt 372a0fe
Start working on DurationHistogram
nareddyt c526b9c
Mapping of all fields
nareddyt 68f3690
Remove first entry from the dataset to make the graph look nicer
nareddyt 40b01c0
Some test data (temporary)
nareddyt f3cb825
Better test data
nareddyt b95cf4e
Fix format
nareddyt 0dca025
Fix tests and docs
nareddyt 6a52796
Fix initial sample
nareddyt a676086
Review comments
nareddyt 4b73fa6
Move fortio proto to ./transform
nareddyt 41838fc
Add test for output formatter
nareddyt a53dd09
Fix format
nareddyt c189419
Remove old test data
nareddyt d210488
Add sample data
nareddyt 6713813
Add docs
nareddyt 48deaea
Remove test data yaml
nareddyt 8550a86
Fix images
nareddyt 4ad87c9
Review comments
nareddyt 22ec3f5
Review comments #2
nareddyt 932814f
Review comments 3
nareddyt ece7105
Merge branch 'master' into fortio-output-format
nareddyt 9a5547a
Add comment about proto-json trick
nareddyt 2ba9e57
Only wrap optional types
nareddyt fe97b6c
Fix README
nareddyt ef16f64
Fix readme
nareddyt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| licenses(["notice"]) # Apache 2 | ||
|
|
||
| load("@envoy//bazel:envoy_build_system.bzl", "envoy_package") | ||
| load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") | ||
|
|
||
| envoy_package() | ||
|
|
||
| api_cc_py_proto_library( | ||
| name = "transform", | ||
| srcs = [ | ||
| "fortio.proto", | ||
| ], | ||
| visibility = ["//visibility:public"], | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| package nighthawk.client; | ||
|
|
||
| import "google/protobuf/duration.proto"; | ||
| import "google/protobuf/timestamp.proto"; | ||
| import "google/protobuf/wrappers.proto"; | ||
| import "validate/validate.proto"; | ||
|
|
||
| // This proto represents that output format that Fortio expects when converted to JSON. | ||
| // Nighthawk can fill in this proto, and then unmarshal to the Fortio-compatible JSON. | ||
| // Therefore, this proto may not follow conventions. aip.dev/not-precedent | ||
| message FortioResult { | ||
| // Disable validate because it doesn't work well with fields that are not all lowercase. | ||
| // The field cases must match the final output JSON that fortio-ui expects. | ||
| option (validate.disabled) = true; | ||
|
|
||
| string Labels = 1; | ||
|
|
||
| google.protobuf.Timestamp StartTime = 2; | ||
|
|
||
| uint32 RequestedQPS = 3; | ||
|
|
||
| google.protobuf.Duration RequestedDuration = 4; | ||
|
|
||
| double ActualQPS = 5; | ||
|
|
||
| double ActualDuration = 6; | ||
|
|
||
| uint32 NumThreads = 7; | ||
|
|
||
| DurationHistogram DurationHistogram = 8; | ||
|
|
||
| map<string, uint64> RetCodes = 11; | ||
|
|
||
| string URL = 12; | ||
| } | ||
|
|
||
| message DurationHistogram { | ||
| option (validate.disabled) = true; | ||
|
|
||
| uint64 Count = 1; | ||
|
|
||
| repeated DataEntry Data = 2; | ||
| } | ||
|
|
||
| message DataEntry { | ||
| option (validate.disabled) = true; | ||
|
|
||
| double Start = 1; | ||
|
|
||
| double End = 2; | ||
|
|
||
| double Percent = 3; | ||
|
|
||
| uint64 Count = 4; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.