Allow configurable resource requests and limits received by helm chart.

main.go

@@ -81,6 +81,24 @@ func stringFlagOrEnv(p *string, name string, envName string, defaultValue string
 	pflag.StringVar(p, name, defaultValue, usage)
 }
 
+func setLangEnvVarsForResource(langStr string, resourceStr string, resource map[string]string) {
+	if cpu, ok := resource["cpu"]; ok {
+		os.Setenv("AUTO_INSTRUMENTATION_"+langStr+"_CPU_"+resourceStr, cpu)
+	}
+	if memory, ok := resource["memory"]; ok {
+		os.Setenv("AUTO_INSTRUMENTATION_"+langStr+"_MEM_"+resourceStr, memory)
+	}
+}
+
+func setLangEnvVars(langStr string, cfg map[string]map[string]string) {
+	if limits, ok := cfg["limits"]; ok {
+		setLangEnvVarsForResource(langStr, "LIMIT", limits)
+	}
+	if requests, ok := cfg["requests"]; ok {
+		setLangEnvVarsForResource(langStr, "REQUEST", requests)
+	}
+}
+
 func main() {
 	// registers any flags that underlying libraries might use
 	opts := zap.Options{}
@@ -93,18 +111,19 @@ func main() {
 
 	// add flags related to this operator
 	var (
-		metricsAddr               string
-		probeAddr                 string
-		pprofAddr                 string
-		agentImage                string
-		autoInstrumentationJava   string
-		autoInstrumentationPython string
-		autoInstrumentationDotNet string
-		autoAnnotationConfigStr   string
-		webhookPort               int
-		tlsOpt                    tlsConfig
-		dcgmExporterImage         string
-		neuronMonitorImage        string
+		metricsAddr                  string
+		probeAddr                    string
+		pprofAddr                    string
+		agentImage                   string
+		autoInstrumentationJava      string
+		autoInstrumentationPython    string
+		autoInstrumentationDotNet    string
+		autoAnnotationConfigStr      string
+		autoInstrumentationConfigStr string
+		webhookPort                  int
+		tlsOpt                       tlsConfig
+		dcgmExporterImage            string
+		neuronMonitorImage           string
 	)
 
 	pflag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
@@ -115,10 +134,27 @@ func main() {
 	stringFlagOrEnv(&autoInstrumentationPython, "auto-instrumentation-python-image", "RELATED_IMAGE_AUTO_INSTRUMENTATION_PYTHON", fmt.Sprintf("%s:%s", autoInstrumentationPythonImageRepository, v.AutoInstrumentationPython), "The default OpenTelemetry Python instrumentation image. This image is used when no image is specified in the CustomResource.")
 	stringFlagOrEnv(&autoInstrumentationDotNet, "auto-instrumentation-dotnet-image", "RELATED_IMAGE_AUTO_INSTRUMENTATION_DOTNET", fmt.Sprintf("%s:%s", autoInstrumentationDotNetImageRepository, v.AutoInstrumentationDotNet), "The default OpenTelemetry Dotnet instrumentation image. This image is used when no image is specified in the CustomResource.")
 	stringFlagOrEnv(&autoAnnotationConfigStr, "auto-annotation-config", "AUTO_ANNOTATION_CONFIG", "", "The configuration for auto-annotation.")
+	pflag.StringVar(&autoInstrumentationConfigStr, "auto-instrumentation-config", "", "The configuration for auto-instrumentation.")
 	stringFlagOrEnv(&dcgmExporterImage, "dcgm-exporter-image", "RELATED_IMAGE_DCGM_EXPORTER", fmt.Sprintf("%s:%s", dcgmExporterImageRepository, v.DcgmExporter), "The default DCGM Exporter image. This image is used when no image is specified in the CustomResource.")
 	stringFlagOrEnv(&neuronMonitorImage, "neuron-monitor-image", "RELATED_IMAGE_NEURON_MONITOR", fmt.Sprintf("%s:%s", neuronMonitorImageRepository, v.NeuronMonitor), "The default Neuron monitor image. This image is used when no image is specified in the CustomResource.")
 	pflag.Parse()
 
+	// set instrumentation cpu and memory limits in environment variables to be used for default instrumentation
+	autoInstrumentationConfig := map[string]map[string]map[string]string{"java": {"limits": {"cpu": "500m", "memory": "64Mi"}, "requests": {"cpu": "50m", "memory": "64Mi"}}, "python": {"limits": {"cpu": "500m", "memory": "32Mi"}, "requests": {"cpu": "50m", "memory": "32Mi"}}, "dotnet": {"limits": {"cpu": "500m", "memory": "128Mi"}, "requests": {"cpu": "50m", "memory": "128Mi"}}}
+	err := json.Unmarshal([]byte(autoInstrumentationConfigStr), &autoInstrumentationConfig)
+	if err != nil {
+		setupLog.Info(fmt.Sprintf("Using default values: %v", autoInstrumentationConfig))
+	}
+	if javaVar, ok := autoInstrumentationConfig["java"]; ok {
+		setLangEnvVars("JAVA", javaVar)
+	}
+	if pythonVar, ok := autoInstrumentationConfig["python"]; ok {
+		setLangEnvVars("PYTHON", pythonVar)
+	}
+	if dotNetVar, ok := autoInstrumentationConfig["dotnet"]; ok {
+		setLangEnvVars("DOTNET", dotNetVar)
+	}
+
 	// set supported language instrumentation images in environment variable to be used for default instrumentation
 	os.Setenv("AUTO_INSTRUMENTATION_JAVA", autoInstrumentationJava)
 	os.Setenv("AUTO_INSTRUMENTATION_PYTHON", autoInstrumentationPython)

pkg/instrumentation/defaultinstrumentation.go

@@ -8,6 +8,8 @@ import (
 	"fmt"
 	"os"
 
+	"k8s.io/apimachinery/pkg/api/resource"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -25,6 +27,22 @@ const (
 	https = "https"
 )
 
+func getInstrumentationConfigForResource(langStr string, resourceStr string) corev1.ResourceList {
+	instrumentationConfigCpu, _ := os.LookupEnv("AUTO_INSTRUMENTATION_" + langStr + "_CPU_" + resourceStr)
+	instrumentationConfigMemory, _ := os.LookupEnv("AUTO_INSTRUMENTATION_" + langStr + "_MEM_" + resourceStr)
+
+	instrumentationConfigForResource := corev1.ResourceList{}
+	instrumentationConfigCpuQuantity, err := resource.ParseQuantity(instrumentationConfigCpu)
+	if err == nil {
+		instrumentationConfigForResource[corev1.ResourceCPU] = instrumentationConfigCpuQuantity
+	}
+	instrumentationConfigMemoryQuantity, err := resource.ParseQuantity(instrumentationConfigMemory)
+	if err == nil {
+		instrumentationConfigForResource[corev1.ResourceMemory] = instrumentationConfigMemoryQuantity
+	}
+	return instrumentationConfigForResource
+}
+
 func getDefaultInstrumentation(agentConfig *adapters.CwaConfig, isWindowsPod bool) (*v1alpha1.Instrumentation, error) {
 	javaInstrumentationImage, ok := os.LookupEnv("AUTO_INSTRUMENTATION_JAVA")
 	if !ok {
@@ -86,6 +104,10 @@ func getDefaultInstrumentation(agentConfig *adapters.CwaConfig, isWindowsPod boo
 					{Name: "OTEL_METRICS_EXPORTER", Value: "none"},
 					{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
 				},
+				Resources: corev1.ResourceRequirements{
+					Limits:   getInstrumentationConfigForResource("JAVA", "LIMIT"),
+					Requests: getInstrumentationConfigForResource("JAVA", "REQUEST"),
+				},
 			},
 			Python: v1alpha1.Python{
 				Image: pythonInstrumentationImage,
@@ -103,6 +125,10 @@ func getDefaultInstrumentation(agentConfig *adapters.CwaConfig, isWindowsPod boo
 					{Name: "OTEL_PYTHON_CONFIGURATOR", Value: "aws_configurator"},
 					{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
 				},
+				Resources: corev1.ResourceRequirements{
+					Limits:   getInstrumentationConfigForResource("PYTHON", "LIMIT"),
+					Requests: getInstrumentationConfigForResource("PYTHON", "REQUEST"),
+				},
 			},
 			DotNet: v1alpha1.DotNet{
 				Image: dotNetInstrumentationImage,
@@ -120,6 +146,10 @@ func getDefaultInstrumentation(agentConfig *adapters.CwaConfig, isWindowsPod boo
 					{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
 					{Name: "OTEL_DOTNET_AUTO_PLUGINS", Value: "AWS.Distro.OpenTelemetry.AutoInstrumentation.Plugin, AWS.Distro.OpenTelemetry.AutoInstrumentation"},
 				},
+				Resources: corev1.ResourceRequirements{
+					Limits:   getInstrumentationConfigForResource("DOTNET", "LIMIT"),
+					Requests: getInstrumentationConfigForResource("DOTNET", "REQUEST"),
+				},
 			},
 		},
 	}, nil