[GEN-1406] chore: pull main

Makefile

@@ -198,4 +198,12 @@ cli-install:
 .PHONY: cli-upgrade
 cli-upgrade:
 	@echo "Installing odigos from source. version: $(ODIGOS_CLI_VERSION)"
-	cd ./cli ; go run -tags=embed_manifests . upgrade --version $(ODIGOS_CLI_VERSION) --yes
+	cd ./cli ; go run -tags=embed_manifests . upgrade --version $(ODIGOS_CLI_VERSION) --yes
+
+.PHONY: api-all
+api-all:
+	make -C api all
+
+.PHONY: crd-apply
+crd-apply: api-all cli-upgrade
+	@echo "Applying changes to CRDs in api directory"

api/config/crd/bases/odigos.io_instrumentationconfigs.yaml

@@ -214,6 +214,75 @@ spec:
                             required:
                             - libraryName
                             type: object
+                          payloadCollection:
+                            properties:
+                              dbQuery:
+                                description: rule for collecting db payloads for the
+                                  mentioned workload and instrumentation libraries
+                                properties:
+                                  dropPartialPayloads:
+                                    description: |-
+                                      If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                      This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                                    type: boolean
+                                  maxPayloadLength:
+                                    description: |-
+                                      Maximum length of the payload to collect.
+                                      If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                                    format: int64
+                                    type: integer
+                                type: object
+                              httpRequest:
+                                description: |-
+                                  Collect HTTP request payload data when available.
+                                  Can be a client (outgoing) request or a server (incoming) request, depending on the instrumentation library
+                                properties:
+                                  dropPartialPayloads:
+                                    description: |-
+                                      If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                      This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                                    type: boolean
+                                  maxPayloadLength:
+                                    description: |-
+                                      Maximum length of the payload to collect.
+                                      If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                                    format: int64
+                                    type: integer
+                                  mimeTypes:
+                                    description: |-
+                                      Limit payload collection to specific mime types based on the content type header.
+                                      When not specified, all mime types payloads will be collected.
+                                      Empty array will make the rule ineffective.
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                              httpResponse:
+                                description: |-
+                                  rule for collecting the response part of an http payload.
+                                  Can be a client response or a server response, depending on the instrumentation library
+                                properties:
+                                  dropPartialPayloads:
+                                    description: |-
+                                      If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                      This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                                    type: boolean
+                                  maxPayloadLength:
+                                    description: |-
+                                      Maximum length of the payload to collect.
+                                      If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                                    format: int64
+                                    type: integer
+                                  mimeTypes:
+                                    description: |-
+                                      Limit payload collection to specific mime types based on the content type header.
+                                      When not specified, all mime types payloads will be collected.
+                                      Empty array will make the rule ineffective.
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                            type: object
                           traceConfig:
                             properties:
                               enabled:
@@ -241,9 +310,78 @@ spec:
                       - unknown
                       - ignored
                       type: string
+                    payloadCollection:
+                      properties:
+                        dbQuery:
+                          description: rule for collecting db payloads for the mentioned
+                            workload and instrumentation libraries
+                          properties:
+                            dropPartialPayloads:
+                              description: |-
+                                If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                              type: boolean
+                            maxPayloadLength:
+                              description: |-
+                                Maximum length of the payload to collect.
+                                If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                              format: int64
+                              type: integer
+                          type: object
+                        httpRequest:
+                          description: |-
+                            Collect HTTP request payload data when available.
+                            Can be a client (outgoing) request or a server (incoming) request, depending on the instrumentation library
+                          properties:
+                            dropPartialPayloads:
+                              description: |-
+                                If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                              type: boolean
+                            maxPayloadLength:
+                              description: |-
+                                Maximum length of the payload to collect.
+                                If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                              format: int64
+                              type: integer
+                            mimeTypes:
+                              description: |-
+                                Limit payload collection to specific mime types based on the content type header.
+                                When not specified, all mime types payloads will be collected.
+                                Empty array will make the rule ineffective.
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                        httpResponse:
+                          description: |-
+                            rule for collecting the response part of an http payload.
+                            Can be a client response or a server response, depending on the instrumentation library
+                          properties:
+                            dropPartialPayloads:
+                              description: |-
+                                If the payload is larger than the MaxPayloadLength, this parameter will determine if the payload should be partially collected up to the allowed length, or not collected at all.
+                                This is useful if you require some decoding of the payload (like json) and having it partially is not useful.
+                              type: boolean
+                            maxPayloadLength:
+                              description: |-
+                                Maximum length of the payload to collect.
+                                If the payload is longer than this value, it will be truncated or dropped, based on the value of `dropPartialPayloads` config option
+                              format: int64
+                              type: integer
+                            mimeTypes:
+                              description: |-
+                                Limit payload collection to specific mime types based on the content type header.
+                                When not specified, all mime types payloads will be collected.
+                                Empty array will make the rule ineffective.
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                      type: object
                   required:
-                  - instrumentationLibraryConfigs
                   - language
+                  - payloadCollection
                   type: object
                 type: array
             type: object