Merge branch 'main' into nginx_logs_remove

.github/workflows/e2e.yaml

@@ -105,6 +105,8 @@ jobs:
           cluster_name: kind
 
       - name: Install FE
+        # this is used for cypress tests which are not run in every scenario
+        if: matrix.test-scenario == 'multi-apps' || matrix.test-scenario == 'helm-chart' || matrix.test-scenario == 'fe-synthetic'
         run: |
           cd frontend/webapp
           yarn install

Makefile

@@ -39,7 +39,8 @@ build-ui:
 
 .PHONY: build-images
 build-images:
-	make -j 3 build-autoscaler build-scheduler build-odiglet build-instrumentor build-collector build-ui TAG=$(TAG)
+	# prefer to build timeconsuimg images first to make better use of parallelism
+	make -j 3 build-ui build-collector build-odiglet build-autoscaler build-scheduler build-instrumentor TAG=$(TAG)
 
 .PHONY: push-odiglet
 push-odiglet:

frontend/webapp/components/overview/sources/detected-containers/index.tsx

@@ -1,6 +1,7 @@
 // DetectedContainers.tsx
 import { KeyvalText } from '@/design.system';
 import theme from '@/styles/palette';
+import { Condition } from '@/types';
 import React from 'react';
 import styled from 'styled-components';
 
@@ -13,6 +14,7 @@ interface Language {
 
 interface DetectedContainersProps {
   languages: Language[];
+  conditions: Condition[];
 }
 
 const Container = styled.div`
@@ -34,9 +36,9 @@ const ListItem = styled.li`
 
 const DetectedContainers: React.FC<DetectedContainersProps> = ({
   languages,
+  conditions,
 }) => {
-  // Find the first language that is not ignored
-
+  const hasError = conditions.some((condition) => condition.status === 'False');
   return (
     <Container>
       <KeyvalText size={18} weight={600}>
@@ -57,11 +59,10 @@ const DetectedContainers: React.FC<DetectedContainersProps> = ({
                 ? `, Runtime: ${lang.runtime_version}`
                 : ''}
               )
-              <b>
-                {lang.language !== 'ignore' &&
-                  lang.language !== 'unknown' &&
-                  ' - Instrumented'}
-              </b>
+              {lang.language !== 'ignore' &&
+                lang.language !== 'unknown' &&
+                !hasError &&
+                ' - Instrumented'}
             </KeyvalText>
           </ListItem>
         ))}

frontend/webapp/components/setup/connection/create.connection.form/create.connection.form.tsx

@@ -256,7 +256,7 @@ export function CreateConnectionForm({
               <KeyvalLoader width={9} height={9} />
             ) : isConnectionTested.enabled === null ? (
               <KeyvalText color={theme.text.secondary} size={14} weight={600}>
-                {'Check Connection'}
+                {'Test Connection'}
               </KeyvalText>
             ) : isConnectionTested.enabled ? (
               <KeyvalText color={theme.colors.success} size={14} weight={600}>

frontend/webapp/containers/main/instrumentation-rules/choose-rule/index.tsx

@@ -15,7 +15,7 @@ const ITEMS = [
   {
     id: 'payload-collection',
     title: 'Payload Collection',
-    description: 'Collect payloads from logs, metrics, and traces.',
+    description: 'Record operation payloads as span attributes where supported.',
     type: InstrumentationRuleType.PAYLOAD_COLLECTION,
     icon: InstrumentationRuleType.PAYLOAD_COLLECTION,
   },

frontend/webapp/containers/main/sources/edit.source/index.tsx

@@ -113,6 +113,9 @@ export function EditSourceForm() {
             languages={
               currentSource.instrumented_application_details.languages || []
             }
+            conditions={
+              currentSource.instrumented_application_details.conditions
+            }
           />
           <FieldWrapper>
             <KeyvalInput

tests/e2e/workload-lifecycle/02-assert-workload-update.yaml

@@ -1,8 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "2"
   generation: 2 # on step 2, the manifest was updated
   labels:
     app: nodejs-unsupported-version
@@ -28,8 +26,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "4" 
   generation: 4 # step 02 updates the manifest (2->3), then odigos update it again (3->4)
   labels:
     app: nodejs-very-old-version
@@ -57,8 +53,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "4"
   generation: 4 # step 02 updates the manifest (2->3), then odigos update it again (3->4)
   labels:
     app: nodejs-minimum-version
@@ -85,8 +79,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "4"
   generation: 4 # step 02 updates the manifest (2->3), then odigos update it again (3->4)    
   labels:
     app: nodejs-latest-version
@@ -113,8 +105,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "4"
   generation: 4 # step 02 updates the manifest (2->3), then odigos update it again (3->4)
   labels:
     app: nodejs-dockerfile-env
@@ -144,8 +134,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "4"
   generation: 4 # step 02 updates the manifest (2->3), then odigos update it again (3->4)
   labels:
     app: nodejs-manifest-env
@@ -175,8 +163,6 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    deployment.kubernetes.io/revision: "2"
   generation: 2 # on step 2, the manifest was updated (1->2)
   labels:
     app: cpp-http-server
@@ -203,7 +189,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    deployment.kubernetes.io/revision: "4"
     (odigos.io/manifest-env-original-val == null): true
   generation: 5 # started as 2, updated by test once, then by instrumentor and again after new runtime details updated
   labels: