Language detection in Odiglet (#167)

This PR contains the following changes to Odigos: - **Refactor language detection**: instead of creating and deleting pods, Odigos now detects languages via Odiglet. - **Labeling support**: Odigos detects and instruments applications according to labeled namespaces, deployments, etc - **Reduced required permissions**: Odigos now does not require permission to delete objects like Pods, Deployments, etc.
odigos-io · May 15, 2023 · 0a4dd14 · 0a4dd14
1 parent 2186d4d
commit 0a4dd14
Show file tree

Hide file tree

Showing 87 changed files with 7,942 additions and 2,045 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,18 +30,11 @@ jobs:
           push: false
           tags: instrumentor:pr-${{ github.event.number }}
           build-args: SERVICE_NAME=instrumentor
-      - name: Build Detector Image
-        uses: docker/build-push-action@v4
-        with:
-          file: langDetector/Dockerfile
-          push: false
-          tags: lang-detector:pr-${{ github.event.number }}
-          build-args: SERVICE_NAME=langDetector
       - name: Build Odiglet Image
         uses: docker/build-push-action@v4
         with:
           file: odiglet/Dockerfile
-          context: odiglet/
+          context: .
           push: false
           tags: odiglet:pr-${{ github.event.number }}
       - name: Build UI Image

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -51,30 +51,13 @@ jobs:
           tags: ghcr.io/keyval-dev/odigos/instrumentor:${{ steps.vars.outputs.tag }}
           build-args: SERVICE_NAME=instrumentor
           platforms: linux/amd64,linux/arm64
-      - name: Build Detector Image
-        uses: docker/build-push-action@v4
-        with:
-          file: langDetector/Dockerfile
-          push: true
-          tags: ghcr.io/keyval-dev/odigos/lang-detector:${{ steps.vars.outputs.tag }}
-          build-args: SERVICE_NAME=langDetector
-          platforms: linux/amd64,linux/arm64
       - name: Build Odiglet Image
         uses: docker/build-push-action@v4
         with:
           file: odiglet/Dockerfile
-          context: odiglet/
           push: true
           tags: ghcr.io/keyval-dev/odigos/odiglet:${{ steps.vars.outputs.tag }}
           platforms: linux/amd64,linux/arm64
-      - name: Build Init Image
-        uses: docker/build-push-action@v4
-        with:
-          file: init/Dockerfile
-          context: init/
-          push: true
-          tags: ghcr.io/keyval-dev/odigos/init:${{ steps.vars.outputs.tag }}
-          platforms: linux/amd64,linux/arm64
       - name: Build UI Image
         uses: docker/build-push-action@v4
         with:

diff --git a/Makefile b/Makefile
@@ -2,28 +2,22 @@
 build-images:
 	docker build -t ghcr.io/keyval-dev/odigos/autoscaler:$(TAG) . --build-arg SERVICE_NAME=autoscaler
 	docker build -t ghcr.io/keyval-dev/odigos/scheduler:$(TAG) . --build-arg SERVICE_NAME=scheduler
-	docker build -t ghcr.io/keyval-dev/odigos/lang-detector:$(TAG)  -f langDetector/Dockerfile . --build-arg SERVICE_NAME=langDetector
 	docker build -t ghcr.io/keyval-dev/odigos/ui:$(TAG) ui/ -f ui/Dockerfile
-	docker build -t ghcr.io/keyval-dev/odigos/odiglet:$(TAG) odiglet/ -f odiglet/Dockerfile
-	docker build -t ghcr.io/keyval-dev/odigos/init:$(TAG) init/ -f init/Dockerfile
+	docker build -t ghcr.io/keyval-dev/odigos/odiglet:$(TAG) . -f odiglet/Dockerfile
 	docker build -t ghcr.io/keyval-dev/odigos/instrumentor:$(TAG) . --build-arg SERVICE_NAME=instrumentor
 
 .PHONY: push-images
 push-images:
 	docker push ghcr.io/keyval-dev/odigos/autoscaler:$(TAG)
 	docker push ghcr.io/keyval-dev/odigos/scheduler:$(TAG)
-	docker push ghcr.io/keyval-dev/odigos/lang-detector:$(TAG)
 	docker push ghcr.io/keyval-dev/odigos/ui:$(TAG)
 	docker push ghcr.io/keyval-dev/odigos/instrumentor:$(TAG)
-	docker push ghcr.io/keyval-dev/odigos/init:$(TAG)
 	docker push ghcr.io/keyval-dev/odigos/odiglet:$(TAG)
 
 .PHONY: load-to-kind
 load-to-kind:
 	kind load docker-image ghcr.io/keyval-dev/odigos/autoscaler:$(TAG)
 	kind load docker-image ghcr.io/keyval-dev/odigos/scheduler:$(TAG)
-	kind load docker-image ghcr.io/keyval-dev/odigos/lang-detector:$(TAG)
 	kind load docker-image ghcr.io/keyval-dev/odigos/ui:$(TAG)
 	kind load docker-image ghcr.io/keyval-dev/odigos/odiglet:$(TAG)
-	kind load docker-image ghcr.io/keyval-dev/odigos/init:$(TAG)
 	kind load docker-image ghcr.io/keyval-dev/odigos/instrumentor:$(TAG)
diff --git a/api/bin/controller-gen b/api/bin/controller-gen
diff --git a/api/bin/kustomize b/api/bin/kustomize
diff --git a/api/config/crd/bases/odigos.io_instrumentedapplications.yaml b/api/config/crd/bases/odigos.io_instrumentedapplications.yaml
@@ -37,8 +37,6 @@ spec:
             description: InstrumentedApplicationSpec defines the desired state of
               InstrumentedApplication
             properties:
-              enabled:
-                type: boolean
               languages:
                 items:
                   properties:
@@ -59,29 +57,10 @@ spec:
                   - language
                   type: object
                 type: array
-              waitingForDataCollection:
-                type: boolean
-            required:
-            - waitingForDataCollection
             type: object
           status:
             description: InstrumentedApplicationStatus defines the observed state
               of InstrumentedApplication
-            properties:
-              instrumented:
-                type: boolean
-              langDetection:
-                properties:
-                  phase:
-                    enum:
-                    - Pending
-                    - Running
-                    - Completed
-                    - Error
-                    type: string
-                type: object
-            required:
-            - instrumented
             type: object
         type: object
     served: true

diff --git a/api/odigos/v1alpha1/instrumentedapplication_types.go b/api/odigos/v1alpha1/instrumentedapplication_types.go
@@ -23,31 +23,13 @@ import (
 
 // InstrumentedApplicationSpec defines the desired state of InstrumentedApplication
 type InstrumentedApplicationSpec struct {
-	Languages                []common.LanguageByContainer `json:"languages,omitempty"`
-	Enabled                  *bool                        `json:"enabled,omitempty"`
-	WaitingForDataCollection bool                         `json:"waitingForDataCollection"`
+	Languages []common.LanguageByContainer `json:"languages,omitempty"`
 }
 
 // InstrumentedApplicationStatus defines the observed state of InstrumentedApplication
 type InstrumentedApplicationStatus struct {
-	LangDetection LangDetectionStatus `json:"langDetection,omitempty"`
-	Instrumented  bool                `json:"instrumented"`
 }
 
-type LangDetectionStatus struct {
-	Phase LangDetectionPhase `json:"phase,omitempty"`
-}
-
-//+kubebuilder:validation:Enum=Pending;Running;Completed;Error
-type LangDetectionPhase string
-
-const (
-	PendingLangDetectionPhase   LangDetectionPhase = "Pending"
-	RunningLangDetectionPhase   LangDetectionPhase = "Running"
-	CompletedLangDetectionPhase LangDetectionPhase = "Completed"
-	ErrorLangDetectionPhase     LangDetectionPhase = "Error"
-)
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

diff --git a/api/odigos/v1alpha1/zz_generated.deepcopy.go b/api/odigos/v1alpha1/zz_generated.deepcopy.go
diff --git a/autoscaler/controllers/datacollection/root.go b/autoscaler/controllers/datacollection/root.go
@@ -3,6 +3,7 @@ package datacollection
 import (
 	"context"
 	odigosv1 "github.com/keyval-dev/odigos/api/odigos/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -62,11 +63,16 @@ func syncDataCollection(instApps *odigosv1.InstrumentedApplicationList, dests *o
 		return err
 	}
 
-	dataCollection.Status.Ready = ds.Status.DesiredNumberScheduled == ds.Status.NumberReady
+	dataCollection.Status.Ready = calcDataCollectionReadyStatus(ds)
 	if err := c.Status().Update(ctx, dataCollection); err != nil {
 		logger.Error(err, "failed to update data collection status")
 		return err
 	}
 
 	return nil
 }
+
+// Data collection is ready if at least 50% of the pods are ready
+func calcDataCollectionReadyStatus(ds *appsv1.DaemonSet) bool {
+	return float64(ds.Status.NumberReady) >= float64(ds.Status.DesiredNumberScheduled)/float64(2)
+}
diff --git a/common/consts/consts.go b/common/consts/consts.go
@@ -12,6 +12,10 @@ const (
 	DefaultOdigosConfigurationName      = "odigos-config"
 	OTLPPort                            = 4317
 	OTLPHttpPort                        = 4318
+	OdigosInstrumentationLabel          = "odigos-instrumentation"
+	InstrumentationEnabled              = "enabled"
+	InstrumentationDisabled             = "disabled"
+	GolangInstrumentationImage          = "keyval/otel-go-agent:v0.6.5"
 )
 
 var (

diff --git a/common/utils/names.go b/common/utils/names.go
@@ -0,0 +1,19 @@
+package utils
+
+import (
+	"errors"
+	"strings"
+)
+
+func GetRuntimeObjectName(name string, kind string) string {
+	return strings.ToLower(kind + "-" + name)
+}
+
+func GetTargetFromRuntimeName(name string) (string, string, error) {
+	parts := strings.Split(name, "-")
+	if len(parts) < 2 {
+		return "", "", errors.New("invalid runtime name")
+	}
+
+	return strings.Join(parts[1:], "-"), parts[0], nil
+}
diff --git a/init/Dockerfile b/init/Dockerfile
diff --git a/init/go.mod b/init/go.mod
diff --git a/init/main.go b/init/main.go