Merge pull request #70 from formancehq/feat/add_otel_batch

feat: add otel batch
formancehq · Nov 6, 2024 · a1064ad · a1064ad
2 parents 4a35e70 + 16fd9fe
commit a1064ad
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -5,14 +5,14 @@
 | Readme | Chart Version | App Version | Description | Hub |
 |--------|---------------|-------------|-------------|-----|
 | [Agent](./charts/agent/README.md) | v2.1.0 |v2.0.18 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
-| [Cloudprem](./charts/cloudprem/README.md) | v2.0.0-beta.36 |v0.35.3 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
-| [Console](./charts/console/README.md) | v1.0.0-beta.14 |fccc26c5b568781b86fbd06c651399c0edd67bac | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
-| [Core](./charts/core/README.md) | v1.0.0-beta.8 |latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
+| [Cloudprem](./charts/cloudprem/README.md) | v2.0.0-beta.37 |v0.35.3 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
+| [Console](./charts/console/README.md) | v1.0.0-beta.15 |fccc26c5b568781b86fbd06c651399c0edd67bac | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
+| [Core](./charts/core/README.md) | v1.0.0-beta.9 |latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
 | [Demo](./charts/demo/README.md) | 2.0.0 |latest | Formance Private Regions Demo | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/demo)](https://artifacthub.io/packages/search?repo=demo) |
-| [Membership](./charts/membership/README.md) | v1.0.0-beta.22 |v0.35.3 | Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
-| [Portal](./charts/portal/README.md) | v1.0.0-beta.15 |191a441519a65dae56a5b2cf56fe64eee03fc059 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
+| [Membership](./charts/membership/README.md) | v1.0.0-beta.23 |v0.35.3 | Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
+| [Portal](./charts/portal/README.md) | v1.0.0-beta.16 |191a441519a65dae56a5b2cf56fe64eee03fc059 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
 | [Regions](./charts/regions/README.md) | v2.2.0 |latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
-| [Stargate](./charts/stargate/README.md) | 0.5.7 |latest | Formance Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |
+| [Stargate](./charts/stargate/README.md) | 0.5.8 |latest | Formance Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |
 
 ## How to contribute
 

diff --git a/charts/cloudprem/Chart.lock b/charts/cloudprem/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: membership
   repository: file://../membership
-  version: v1.0.0-beta.22
+  version: v1.0.0-beta.23
 - name: portal
   repository: file://../portal
-  version: v1.0.0-beta.15
+  version: v1.0.0-beta.16
 - name: console
   repository: file://../console
-  version: v1.0.0-beta.14
-digest: sha256:ce4fbad625318665b1f29df0f5dc32ad685b930509ae70b841127898c068fc6f
-generated: "2024-11-05T21:25:07.278451895Z"
+  version: v1.0.0-beta.15
+digest: sha256:ab31b6b2427e9cd67a5ddc7efddfe68f929d888f49f57bbe5e58e7c780819aa6
+generated: "2024-11-05T22:02:01.252800658Z"
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
@@ -32,7 +32,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v2.0.0-beta.36"
+version: "v2.0.0-beta.37"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -45,14 +45,14 @@ sources: []
 
 dependencies:
   - name: membership
-    version: v1.0.0-beta.22
+    version: v1.0.0-beta.23
     repository: file://../membership
     condition: membership.enabled
   - name: portal
-    version: v1.0.0-beta.15
+    version: v1.0.0-beta.16
     repository: file://../portal
     condition: portal.enabled
   - name: console
-    version: v1.0.0-beta.14
+    version: v1.0.0-beta.15
     repository: file://../console
     condition: console.enabled
diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
@@ -1,5 +1,5 @@
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem)
-![Version: v2.0.0-beta.36](https://img.shields.io/badge/Version-v2.0.0--beta.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
+![Version: v2.0.0-beta.37](https://img.shields.io/badge/Version-v2.0.0--beta.37-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
 
 # Formance Cloudprem Helm Chart
 
@@ -349,6 +349,7 @@ Dex:
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | global.debug | bool | `false` | Enable debug mode |
+| global.monitoring.batch | bool | `false` | Enable otel batching |
 | global.monitoring.logs.enabled | bool | `true` | Enable logging |
 | global.monitoring.logs.format | string | `"json"` | Format |
 | global.monitoring.logs.level | string | `"info"` | Level: Info, Debug, Error |

diff --git a/charts/cloudprem/values.schema.json b/charts/cloudprem/values.schema.json
@@ -19,6 +19,9 @@
                 },
                 "monitoring": {
                     "properties": {
+                        "batch": {
+                            "type": "boolean"
+                        },
                         "logs": {
                             "properties": {
                                 "enabled": {

diff --git a/charts/cloudprem/values.yaml b/charts/cloudprem/values.yaml
@@ -64,6 +64,9 @@ global:
         # -- is the host for the oidc
         host: "dex.{{ .Values.global.serviceHost }}"
   monitoring:
+    # -- Enable otel batching
+    # @section -- Global configuration
+    batch: false
     traces:
       # -- Enable otel tracing
       # @section -- Global configuration

diff --git a/charts/console/Chart.lock b/charts/console/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: v1.0.0-beta.8
-digest: sha256:b644903949f31817128a7294140aaf1e5410a98e9e55a9d4852bcab67d0bf09e
-generated: "2024-10-31T14:26:59.40485062Z"
+  version: v1.0.0-beta.9
+digest: sha256:01501d00afa1da80340e6a8c941695e4164b74520fc872cc3501054dbcd2c8c0
+generated: "2024-11-05T22:01:49.773921478Z"
diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v1.0.0-beta.14"
+version: "v1.0.0-beta.15"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -35,5 +35,5 @@ sources:
 
 dependencies:
   - name: core
-    version: "v1.0.0-beta.8"
+    version: "v1.0.0-beta.9"
     repository: file://../core
diff --git a/charts/console/README.md b/charts/console/README.md
@@ -1,6 +1,6 @@
 # console
 
-![Version: v1.0.0-beta.14](https://img.shields.io/badge/Version-v1.0.0--beta.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: fccc26c5b568781b86fbd06c651399c0edd67bac](https://img.shields.io/badge/AppVersion-fccc26c5b568781b86fbd06c651399c0edd67bac-informational?style=flat-square)
+![Version: v1.0.0-beta.15](https://img.shields.io/badge/Version-v1.0.0--beta.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: fccc26c5b568781b86fbd06c651399c0edd67bac](https://img.shields.io/badge/AppVersion-fccc26c5b568781b86fbd06c651399c0edd67bac-informational?style=flat-square)
 
 Formance Console
 
@@ -22,7 +22,7 @@ Kubernetes: `>=1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../core | core | v1.0.0-beta.8 |
+| file://../core | core | v1.0.0-beta.9 |
 
 ## Values
 
@@ -38,6 +38,7 @@ Kubernetes: `>=1.14.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | global.debug | bool | `false` | Enable debug mode |
+| global.monitoring.batch | bool | `false` | Enable otel batching |
 | global.monitoring.traces.enabled | bool | `false` | Enable otel tracing |
 | global.monitoring.traces.endpoint | string | `""` | Endpoint |
 | global.monitoring.traces.exporter | string | `"otlp"` | Exporter |

diff --git a/charts/console/values.schema.json b/charts/console/values.schema.json
@@ -83,6 +83,9 @@
                 },
                 "monitoring": {
                     "properties": {
+                        "batch": {
+                            "type": "boolean"
+                        },
                         "traces": {
                             "properties": {
                                 "enabled": {

diff --git a/charts/console/values.yaml b/charts/console/values.yaml
@@ -12,6 +12,9 @@ global:
     elb: false
 
   monitoring:
+    # -- Enable otel batching
+    # @section -- Global configuration
+    batch: false
     traces:
       # -- Enable otel tracing
       # @section -- Global configuration

diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
 icon: "https://avatars.githubusercontent.com/u/84325077?s=200&v=4"
 
 type: library
-version: "v1.0.0-beta.8"
+version: "v1.0.0-beta.9"
 appVersion: "latest"
diff --git a/charts/core/README.md b/charts/core/README.md
@@ -1,6 +1,6 @@
 # core
 
-![Version: v1.0.0-beta.8](https://img.shields.io/badge/Version-v1.0.0--beta.8-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: v1.0.0-beta.9](https://img.shields.io/badge/Version-v1.0.0--beta.9-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 Formance Core Library
 

diff --git a/charts/core/templates/_monitoring.tpl b/charts/core/templates/_monitoring.tpl
@@ -93,6 +93,8 @@
 {{- define "core.monitoring.common" }}
 - name: OTEL_SERVICE_NAME
   value: {{ include "resolveGlobalOrServiceValue" (dict "Context" . "Key" "monitoring.serviceName" "Default" "{{ .Chart.Name }}") | quote}}
+- name: OTEL_BATCH
+  value: {{ include "resolveGlobalOrServiceValue" (dict "Context" . "Key" "monitoring.batch" "Default" "false") | quote}}
 - name: OTEL_RESOURCE_ATTRIBUTES
   value: {{ include "resolveGlobalOrServiceValue" (dict "Context" . "Key" "monitoring.attributes" "Default" "") | quote}}
 {{- end -}}

diff --git a/charts/membership/Chart.lock b/charts/membership/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 0.17.1
 - name: core
   repository: file://../core
-  version: v1.0.0-beta.8
-digest: sha256:b639fe983b061a42b17ae289a635460bde2b51b0af805ca0117d34b0a3fc41ad
-generated: "2024-10-31T14:27:00.924413276Z"
+  version: v1.0.0-beta.9
+digest: sha256:b3909c489031883c21347a1aceb1f0c6a99dd10b1f54a105b935188d9c6dfeb1
+generated: "2024-11-05T22:00:03.003616666Z"
diff --git a/charts/membership/Chart.yaml b/charts/membership/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v1.0.0-beta.22"
+version: "v1.0.0-beta.23"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -37,5 +37,5 @@ dependencies:
     repository: https://charts.dexidp.io
     condition: dex.enabled
   - name: core
-    version: "v1.0.0-beta.8"
+    version: "v1.0.0-beta.9"
     repository: file://../core
diff --git a/charts/membership/README.md b/charts/membership/README.md
@@ -1,6 +1,6 @@
 # membership
 
-![Version: v1.0.0-beta.22](https://img.shields.io/badge/Version-v1.0.0--beta.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
+![Version: v1.0.0-beta.23](https://img.shields.io/badge/Version-v1.0.0--beta.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
 
 Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions.
 
@@ -14,7 +14,7 @@ Kubernetes: `>=1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../core | core | v1.0.0-beta.8 |
+| file://../core | core | v1.0.0-beta.9 |
 | https://charts.dexidp.io | dex | 0.17.X |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 15.5.X |
 
@@ -34,10 +34,11 @@ Kubernetes: `>=1.14.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | global.debug | bool | `false` | Enable debug mode |
+| global.monitoring.batch | bool | `false` | Enable otel batching |
 | global.monitoring.logs.enabled | bool | `true` | Enable logging |
 | global.monitoring.logs.format | string | `"json"` | Format |
 | global.monitoring.logs.level | string | `"info"` | Level: Info, Debug, Error |
-| global.monitoring.traces.enabled | bool | `true` | Enable otel tracing |
+| global.monitoring.traces.enabled | bool | `false` | Enable otel tracing |
 | global.monitoring.traces.endpoint | string | `""` | Endpoint |
 | global.monitoring.traces.exporter | string | `"otlp"` | Exporter |
 | global.monitoring.traces.insecure | bool | `true` | Insecure |

diff --git a/charts/membership/values.schema.json b/charts/membership/values.schema.json
@@ -560,6 +560,9 @@
                 },
                 "monitoring": {
                     "properties": {
+                        "batch": {
+                            "type": "boolean"
+                        },
                         "logs": {
                             "properties": {
                                 "enabled": {

diff --git a/charts/membership/values.yaml b/charts/membership/values.yaml
@@ -82,10 +82,13 @@ global:
         username: username
 
   monitoring:
+    # -- Enable otel batching
+    # @section -- Global configuration
+    batch: false
     traces:
       # -- Enable otel tracing
       # @section -- Global configuration
-      enabled: true
+      enabled: false
       # -- Endpoint
       # @section -- Global configuration
       endpoint: ""

diff --git a/charts/portal/Chart.lock b/charts/portal/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: v1.0.0-beta.8
-digest: sha256:b644903949f31817128a7294140aaf1e5410a98e9e55a9d4852bcab67d0bf09e
-generated: "2024-10-31T14:26:59.376194251Z"
+  version: v1.0.0-beta.9
+digest: sha256:01501d00afa1da80340e6a8c941695e4164b74520fc872cc3501054dbcd2c8c0
+generated: "2024-11-05T22:01:49.777395857Z"
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v1.0.0-beta.15"
+version: "v1.0.0-beta.16"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -37,5 +37,5 @@ sources:
 
 dependencies:
   - name: core
-    version: "v1.0.0-beta.8"
+    version: "v1.0.0-beta.9"
     repository: file://../core
diff --git a/charts/portal/README.md b/charts/portal/README.md
@@ -1,6 +1,6 @@
 # portal
 
-![Version: v1.0.0-beta.15](https://img.shields.io/badge/Version-v1.0.0--beta.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 191a441519a65dae56a5b2cf56fe64eee03fc059](https://img.shields.io/badge/AppVersion-191a441519a65dae56a5b2cf56fe64eee03fc059-informational?style=flat-square)
+![Version: v1.0.0-beta.16](https://img.shields.io/badge/Version-v1.0.0--beta.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 191a441519a65dae56a5b2cf56fe64eee03fc059](https://img.shields.io/badge/AppVersion-191a441519a65dae56a5b2cf56fe64eee03fc059-informational?style=flat-square)
 
 Formance Portal
 
@@ -22,7 +22,7 @@ Kubernetes: `>=1.14.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../core | core | v1.0.0-beta.8 |
+| file://../core | core | v1.0.0-beta.9 |
 
 ## Values
 
@@ -38,6 +38,7 @@ Kubernetes: `>=1.14.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | global.debug | bool | `false` | Enable debug mode |
+| global.monitoring.batch | bool | `false` | Enable otel batching |
 | global.monitoring.traces.enabled | bool | `false` | Enable otel tracing |
 | global.monitoring.traces.endpoint | string | `""` | Endpoint |
 | global.monitoring.traces.exporter | string | `"otlp"` | Exporter |

diff --git a/charts/portal/values.schema.json b/charts/portal/values.schema.json
@@ -102,6 +102,9 @@
                 },
                 "monitoring": {
                     "properties": {
+                        "batch": {
+                            "type": "boolean"
+                        },
                         "traces": {
                             "properties": {
                                 "enabled": {

diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
@@ -12,6 +12,9 @@ global:
     elb: false
 
   monitoring:
+    # -- Enable otel batching
+    # @section -- Global configuration
+    batch: false
     traces:
       # -- Enable otel tracing
       # @section -- Global configuration

diff --git a/charts/stargate/Chart.lock b/charts/stargate/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: v1.0.0-beta.8
+  version: v1.0.0-beta.9
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 15.5.38
-digest: sha256:9babd730117bd1564be3fcb660f25bfda24c0634a1b4dc9bee6c3e820217ec8f
-generated: "2024-10-31T14:27:00.628520493Z"
+digest: sha256:611874693985f502db670d2cdc464a60c4ecf5c873cc5acb4c64d1a05160a4ce
+generated: "2024-11-05T22:01:51.173205181Z"
diff --git a/charts/stargate/Chart.yaml b/charts/stargate/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.7
+version: 0.5.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -26,7 +26,7 @@ appVersion: "latest"
 
 dependencies:
   - name: core
-    version: "v1.0.0-beta.8"
+    version: "v1.0.0-beta.9"
     repository: file://../core
   - name: postgresql
     repository: oci://registry-1.docker.io/bitnamicharts