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

[1.17] Expose max_buffered_{rx/tx}_bytes in the Tap filter (#9656) (#10016) #10032

Merged
merged 2 commits into from
Sep 13, 2024
Merged

[1.17] Expose max_buffered_{rx/tx}_bytes in the Tap filter (#9656) (#10016) #10032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fe6bf4
[1.17] Expose max_buffered_{rx/tx}_bytes in the Tap filter (#9656) (#…
andy-fong Sep 11, 2024
bfc58f5
kick-ci
andy-fong Sep 13, 2024
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
9 changes: 9 additions & 0 deletions changelog/v1.17.8/new-fields-for-tap-filter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
changelog:
- type: FIX
issueLink: https://github.com/solo-io/gloo/issues/9656
resolvesIssue: false
description: >-
Expose max_buffered_{rx/tx}_bytes, record_headers_received_time
and record_downstream_connection settings for the Tap filter config.
Backported from v1.18 and this feature will be backported to
Enterprise version v1.17.2
8 changes: 8 additions & 0 deletions ...ub.com/solo-io/gloo/projects/gloo/api/v1/enterprise/options/tap/tap.proto.sk.md
View file
Open in desktop

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

32 changes: 32 additions & 0 deletions install/helm/gloo/crds/gateway.solo.io_v1_Gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,22 @@ spec:
type: object
tap:
properties:
maxBufferedRxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
maxBufferedTxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
recordDownstreamConnection:
nullable: true
type: boolean
recordHeadersReceivedTime:
nullable: true
type: boolean
sinks:
items:
properties:
Expand Down Expand Up @@ -3220,6 +3236,22 @@ spec:
type: object
tap:
properties:
maxBufferedRxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
maxBufferedTxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
recordDownstreamConnection:
nullable: true
type: boolean
recordHeadersReceivedTime:
nullable: true
type: boolean
sinks:
items:
properties:
Expand Down
16 changes: 16 additions & 0 deletions install/helm/gloo/crds/gateway.solo.io_v1_HttpListenerOption.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,22 @@ spec:
type: object
tap:
properties:
maxBufferedRxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
maxBufferedTxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
recordDownstreamConnection:
nullable: true
type: boolean
recordHeadersReceivedTime:
nullable: true
type: boolean
sinks:
items:
properties:
Expand Down
16 changes: 16 additions & 0 deletions install/helm/gloo/crds/gateway.solo.io_v1_MatchableHttpGateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,22 @@ spec:
type: object
tap:
properties:
maxBufferedRxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
maxBufferedTxBytes:
maximum: 4294967295
minimum: 0
nullable: true
type: integer
recordDownstreamConnection:
nullable: true
type: boolean
recordHeadersReceivedTime:
nullable: true
type: boolean
sinks:
items:
properties:
Expand Down
19 changes: 19 additions & 0 deletions projects/gloo/api/v1/enterprise/options/tap/tap.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/ta

import "github.com/solo-io/solo-kit/api/v1/ref.proto";
import "validate/validate.proto";
import "google/protobuf/wrappers.proto";
import "google/protobuf/duration.proto";

// Tap filter: a filter that copies the contents of HTTP requests and responses
Expand All @@ -16,6 +17,24 @@ message Tap {
// Sinks to which tap data should be output. Currently, only a single sink
// is supported.
repeated Sink sinks = 1 [(validate.rules).repeated = {max_items: 1, min_items: 1}];

// For buffered tapping, the maximum amount of received body that will be buffered
// prior to truncation. If truncation occurs, the truncated field will be set.
// If not specified, the default is 1KiB.
google.protobuf.UInt32Value max_buffered_rx_bytes = 2;

// For buffered tapping, the maximum amount of transmitted body that will be buffered
// prior to truncation. If truncation occurs, the truncated field will be set.
// If not specified, the default is 1KiB.
google.protobuf.UInt32Value max_buffered_tx_bytes = 3;

// Indicates whether tap filter records the time stamp for request/response headers.
// Request headers time stamp is stored after receiving request headers.
// Response headers time stamp is stored after receiving response headers.
google.protobuf.BoolValue record_headers_received_time = 4;

// Indicates whether report downstream connection info
google.protobuf.BoolValue record_downstream_connection = 5;
}

message Sink {
Expand Down
Loading
Loading