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

feat: Bump Fluent Bit to 3.0.4 (#1108) #1114

Merged
merged 3 commits into from
May 24, 2024
Merged

feat: Bump Fluent Bit to 3.0.4 (#1108) #1114

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
640040a
feat: Bump Fluent Bit to 3.0.4 (#1108)
May 23, 2024
7e436d8
chore: Fix linting issues with 1.58.2 (#1096)
k15r May 21, 2024
8b2183a
Exclude gochecknoinits linter
chrkl May 23, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COPY webhook/ webhook/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go mod tidy && go build -a -o manager main.go

# Use the fluent-bit image because we need the fluent-bit binary
FROM europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:2.2.1-8adfb683
FROM europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:3.0.4-5d3fb7b6

WORKDIR /
COPY --from=builder /telemetry-manager-workspace/manager .
Expand Down
15 changes: 9 additions & 6 deletions ...contributor/telemetry-load-test/README.md → docs/contributor/benchmarks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ All test scenarios use a single test script [run-load-test.sh](../../../hack/loa

### Assumptions

The tests are executed for 20 minutes, so that each test case has a stabilized output and reliable KPIs. Generated traces contain at least 2 spans, and each span has 40 attributes to simulate an average trace span size.
The tests are executed for 20 minutes, so that each test case has a stabilized output and reliable KPIs. Generated traces contain at least 2 spans, and each span has 40 attributes to simulate an average trace span size.

The following test cases are identified:

Expand Down Expand Up @@ -286,10 +286,13 @@ Each test scenario has its own test scripts responsible for preparing the test s

<div class="table-wrapper" markdown="block">

| Version/Test | Single Pipeline | | | | | Multi Pipeline | | | | | Single Pipeline Backpressure | | | | | Multi Pipeline Backpressure | | | | |
|-------------:|:---------------------------------------:|:----------------------------------------:|:-------------------------------:|:--------------------:|:-------------:|:---------------------------------------:|:----------------------------------------:|:-------------------------------:|:--------------------:|:-------------:|:---------------------------------------:|:----------------------------------------:|:-------------------------------:|:--------------------:|:-------------:|:---------------------------------------:|:----------------------------------------:|:-------------------------------:|:--------------------:|:-------------:|
| | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage |
| 2.2.1 | 5165 | 8541 | 68518 | 172,190 | 1,1 | 2009 | 2195 | 102932 | 332,320 | 0.9,0.9 | 5914 | 1498 | 79247 | 184,176 | 0.9,1 | 1979 | 489 | 83442 | 310,322 | 0.9,0.9 |
| 2.2.2 | 5159 | 7811 | 75545 | 171,170 | 1,1 | 1910 | 2516 | 103780 | 324,324 | 0.9,0.9 | 5857 | 1513 | 72494 | 189,200 | 1,1 | 1860 | 421 | 90852 | 314,322 | 0.9,0.9 |
| Version/Test | Single Pipeline | | | | | Multi Pipeline | | | | | Single Pipeline Backpressure | | | | | Multi Pipeline Backpressure | | | | |
| ----------------: | :-------------------------------------: | :--------------------------------------: | :-----------------------------: | :------------------: | :-----------: | :-------------------------------------: | :--------------------------------------: | :-----------------------------: | :------------------: | :-----------: | :-------------------------------------: | :--------------------------------------: | :-----------------------------: | :------------------: | :-----------: | :-------------------------------------: | :--------------------------------------: | :-----------------------------: | :------------------: | :-----------: |
| | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage | Input Bytes Processing Rate/sec (KByte) | Output Bytes Processing Rate/sec (KByte) | Filesystem Buffer Usage (KByte) | Pod Memory Usage(MB) | Pod CPU Usage |
| 2.2.1 | 5165 | 8541 | 68518 | 172, 190 | 1, 1 | 2009 | 2195 | 102932 | 332, 320 | 0.9, 0.9 | 5914 | 1498 | 79247 | 184, 176 | 0.9, 1 | 1979 | 489 | 83442 | 310, 322 | 0.9, 0.9 |
| 2.2.2 | 5159 | 7811 | 75545 | 171, 170 | 1, 1 | 1910 | 2516 | 103780 | 324, 324 | 0.9, 0.9 | 5857 | 1513 | 72494 | 189, 200 | 1, 1 | 1860 | 421 | 90852 | 314, 322 | 0.9, 0.9 |
| 2.2.2 (new setup) | 5445 | 9668 | 68453 | 248, 981 | 1, 1 | 6201 | 2747 | 89291 | 544, 720 | 1, 1 | 6009 | 1723 | 58982 | 650, 682 | 1, 1 | 6111 | 385 | 108909 | 686, 931 | 0.9, 0.9 |
| 3.0.3 | 9483 | 22042 | 53251 | 366, 681 | 1, 1 | 10737 | 8785 | 115232 | 953, 568 | 0.9, 0.9 | 10425 | 4610 | 80614 | 856, 704 | 0.9, 0.9 | 10955 | 1724 | 87530 | 503, 594 | 0.9 ,0.9 |
| 3.0.4 | 4341 | 8296 | 35628 | 971, 726 | 0.1,0.1 | 1201 | 544 | 103624 | 652, 815 | 0, 0 | 932 | 297 | 37663 | 615, 726 | 0.1,0.1 | 1477 | 171 | 108885 | 530, 566 | 0, 0.1 |

</div>
0 ...est/assets/log_perf_test_setup.drawio.svg → ...rks/assets/log_perf_test_setup.drawio.svg
View file
Open in desktop
File renamed without changes
0 .../assets/metric_perf_test_setup.drawio.svg → .../assets/metric_perf_test_setup.drawio.svg
View file
Open in desktop
File renamed without changes
0 ...utor/telemetry-load-test/assets/style.css → docs/contributor/benchmarks/assets/style.css
View file
Open in desktop
File renamed without changes.
0 ...t/assets/trace_perf_test_setup.drawio.svg → ...s/assets/trace_perf_test_setup.drawio.svg
View file
Open in desktop
File renamed without changes
5 changes: 4 additions & 1 deletion internal/k8sutils/owner_reference_setter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package k8sutils

import (
"context"
"errors"
"fmt"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -12,6 +13,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)

var ErrNotImplemented = errors.New("not implemented")

// NewOwnerReferenceSetter wraps an existing Kubernetes client with additional functionality
// to set the owner reference for objects before they are created or updated.
// It returns a new client that, when used for Create or Update operations, will automatically
Expand Down Expand Up @@ -40,7 +43,7 @@ type noopWatchClient struct {
}

func (n *noopWatchClient) Watch(_ context.Context, _ client.ObjectList, _ ...client.ListOption) (watch.Interface, error) {
return nil, nil
return nil, ErrNotImplemented
}

func setOwnerReference(owner metav1.Object, ownee client.Object, scheme *runtime.Scheme) error {
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ var (

const (
defaultOtelImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.99.0-41265c69"
defaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:2.2.2-b5220c17"
defaultFluentBitImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:3.0.4-5d3fb7b6"
defaultFluentBitExporterImage = "europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240404-fd3588ce"
defaultSelfMonitorImage = "europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:2.45.5-4f1be411"

Expand Down
2 changes: 1 addition & 1 deletion sec-scanners-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module-name: telemetry
protecode:
- europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.15.0
- europe-docker.pkg.dev/kyma-project/prod/tpi/otel-collector:0.99.0-41265c69
- europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:2.2.2-b5220c17
- europe-docker.pkg.dev/kyma-project/prod/tpi/fluent-bit:3.0.4-5d3fb7b6
- europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20240404-fd3588ce
- europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:2.45.5-4f1be411
whitesource:
Expand Down
Loading