Skip to content

feat: add batch_size support to opentelemetry output plugin #2015

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

Open
mvitz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add batch_size support to opentelemetry output plugin #2015

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
4 changes: 4 additions & 0 deletions apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ type OpenTelemetry struct {
*plugins.Networking `json:"networking,omitempty"`
// Limit the maximum number of Chunks in the filesystem for the current output logical destination.
TotalLimitSize string `json:"totalLimitSize,omitempty"`
// Set the maximum number of log records to be flushed at a time.
// +kubebuilder:validation:Minimum:=0
BatchSize *int32 `json:"batchSize,omitempty"`
Comment on lines +49 to +51
}

// Name implement Section() method
Expand Down Expand Up @@ -101,6 +104,7 @@ func (o *OpenTelemetry) Params(sl plugins.SecretLoader) (*params.KVs, error) {
}

plugins.InsertKVString(kvs, "storage.total_limit_size", o.TotalLimitSize)
plugins.InsertKVField(kvs, "batch_size", o.BatchSize)

return kvs, nil
}
2 changes: 2 additions & 0 deletions apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func TestOpenTelemetry_Params(t *testing.T) {
LogsBodyKey: "expected_logs_body_key",
TLS: &plugins.TLS{Verify: utils.ToPtr(false)},
Networking: &plugins.Networking{SourceAddress: utils.ToPtr("expected_source_address")},
BatchSize: utils.ToPtr[int32](512),
}

expected := params.NewKVs()
Expand All @@ -59,6 +60,7 @@ func TestOpenTelemetry_Params(t *testing.T) {
expected.Insert("tls", "On")
expected.Insert("tls.verify", "false")
expected.Insert("net.source_address", "expected_source_address")
expected.Insert("batch_size", "512")

kvs, err := ot.Params(sl)
g.Expect(err).NotTo(HaveOccurred())
Expand Down
5 changes: 5 additions & 0 deletions apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions charts/fluent-operator-fluent-bit-crds/templates/fluentbit.fluent.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3176,6 +3176,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
6 changes: 6 additions & 0 deletions charts/fluent-operator-fluent-bit-crds/templates/fluentbit.fluent.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3176,6 +3176,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
6 changes: 6 additions & 0 deletions charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3174,6 +3174,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
6 changes: 6 additions & 0 deletions charts/fluent-operator/crds/fluentbit.fluent.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3174,6 +3174,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3175,6 +3175,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/fluentbit.fluent.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3175,6 +3175,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
1 change: 1 addition & 0 deletions docs/plugins/fluentbit/output/open_telemetry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ The OpenTelemetry plugin allows you to take logs, metrics, and traces from Fluen
| tls | | *[plugins.TLS](../tls.md) |
| networking | Include fluentbit networking options for this output-plugin | *[plugins.Networking](../net.md) |
| totalLimitSize | Limit the maximum number of Chunks in the filesystem for the current output logical destination. | string |
| batchSize | Set the maximum number of log records to be flushed at a time. | *int32 |
12 changes: 12 additions & 0 deletions manifests/setup/setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7375,6 +7375,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down Expand Up @@ -38051,6 +38057,12 @@ spec:
exposed through the OpenTelemetry exporter. You may have multiple
of these fields.
type: object
batchSize:
description: Set the maximum number of log records to be flushed
at a time.
format: int32
minimum: 0
type: integer
header:
additionalProperties:
type: string
Expand Down
Loading