Skip to content

Traffic Dump: Add server response HTTP version #6856

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

Merged
shinrich merged 1 commit into from
Jun 12, 2020
Merged

Traffic Dump: Add server response HTTP version #6856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions plugins/experimental/traffic_dump/transaction_data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,14 @@ TransactionData::write_message_node_no_content(TSMBuffer &buffer, TSMLoc &hdr_lo
char const *cp = nullptr;
TSMLoc url_loc = nullptr;

// 1. "version"
// Note that we print this for both requests and responses, so the first
// element in each has to start with a comma.
int version = TSHttpHdrVersionGet(buffer, hdr_loc);
result += R"("version":")" + std::to_string(TS_HTTP_MAJOR(version)) + "." + std::to_string(TS_HTTP_MINOR(version)) + '"';

// Log scheme+method+request-target or status+reason based on header type
if (TSHttpHdrTypeGet(buffer, hdr_loc) == TS_HTTP_TYPE_REQUEST) {
// 1. "version"
int version = TSHttpHdrVersionGet(buffer, hdr_loc);
result += R"("version":")" + std::to_string(TS_HTTP_MAJOR(version)) + "." + std::to_string(TS_HTTP_MINOR(version)) + '"';

TSAssert(TS_SUCCESS == TSHttpHdrUrlGet(buffer, hdr_loc, &url_loc));
// 2. "scheme":
cp = TSUrlSchemeGet(buffer, url_loc, &len);
Expand Down Expand Up @@ -156,12 +158,11 @@ TransactionData::write_message_node_no_content(TSMBuffer &buffer, TSMLoc &hdr_lo
TSfree(url);
TSHandleMLocRelease(buffer, hdr_loc, url_loc);
} else {
// 1. "status":(string)
result += R"("status":)" + std::to_string(TSHttpHdrStatusGet(buffer, hdr_loc));
// 2. "reason":(string)
// 2. "status":(string)
result += R"(,"status":)" + std::to_string(TSHttpHdrStatusGet(buffer, hdr_loc));
// 3. "reason":(string)
cp = TSHttpHdrReasonGet(buffer, hdr_loc, &len);
result += "," + traffic_dump::json_entry("reason", cp, len);
// 3. "encoding"
}

// "headers": [[name(string), value(string)]]
Expand Down
7 changes: 6 additions & 1 deletion tests/tools/lib/replay_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"version": {
"description": "HTTP version",
"type": "string",
"enum": ["0.9", "1.0", "1.1"]
"enum": ["0.9", "1.0", "1.1", "2.0"]
},
"scheme": {
"description": "HTTP scheme (request).",
Expand Down Expand Up @@ -187,6 +187,11 @@
"type": "object",
"required": ["status"],
"properties": {
"version": {
"description": "HTTP version",
"type": "string",
"enum": ["0.9", "1.0", "1.1", "2.0"]
},
"status": {
"description": "Status code.",
"type": "number"
Expand Down