add support for jmx container insights port and updating env vars for JMX

Author: mitali-salvi

internal/manifests/collector/adapters/config_from.go

@@ -93,6 +93,7 @@ type jmx struct{}
 type kubernetes struct {
 	EnhancedContainerInsights bool `json:"enhanced_container_insights,omitempty"`
 	AcceleratedComputeMetrics bool `json:"accelerated_compute_metrics,omitempty"`
+	JMXContainerInsights      bool `json:"jmx_container_insights,omitempty"`
 }
 
 type xray struct {

internal/manifests/collector/ports.go

@@ -200,6 +200,20 @@ func getLogsReceiversServicePorts(logger logr.Logger, config *adapters.CwaConfig
 			servicePortsMap[receiverDefaultPortsMap[EMF]] = []corev1.ServicePort{tcp, udp}
 		}
 	}
+
+	//JMX Container Insights
+	if config.Logs != nil && config.Logs.LogMetricsCollected != nil && config.Logs.LogMetricsCollected.Kubernetes != nil && config.Logs.LogMetricsCollected.Kubernetes.JMXContainerInsights {
+		if _, ok := servicePortsMap[receiverDefaultPortsMap[JmxHttp]]; ok {
+			logger.Info("Duplicate port has been configured in Agent Config for port", zap.Int32("port", receiverDefaultPortsMap[JmxHttp]))
+		} else {
+			tcp := corev1.ServicePort{
+				Name:     JmxHttp,
+				Port:     receiverDefaultPortsMap[JmxHttp],
+				Protocol: corev1.ProtocolTCP,
+			}
+			servicePortsMap[receiverDefaultPortsMap[JmxHttp]] = []corev1.ServicePort{tcp}
+		}
+	}
 }
 
 func getTracesReceiversServicePorts(logger logr.Logger, config *adapters.CwaConfig, servicePortsMap map[int32][]corev1.ServicePort) []corev1.ServicePort {

internal/manifests/collector/ports_test.go

@@ -213,6 +213,15 @@ func TestJMXGetContainerPorts(t *testing.T) {
 	assert.Equal(t, corev1.ProtocolTCP, containerPorts[JmxHttp].Protocol)
 }
 
+func TestJMXContainerInsightsGetContainerPorts(t *testing.T) {
+	cfg := getJSONStringFromFile("./test-resources/jmxContainerInsightsConfig.json")
+	containerPorts := getContainerPorts(logger, cfg, []corev1.ServicePort{})
+	assert.Equal(t, 1, len(containerPorts))
+	assert.Equal(t, int32(4314), containerPorts[JmxHttp].ContainerPort)
+	assert.Equal(t, JmxHttp, containerPorts[JmxHttp].Name)
+	assert.Equal(t, corev1.ProtocolTCP, containerPorts[JmxHttp].Protocol)
+}
+
 func getJSONStringFromFile(path string) string {
 	buf, err := os.ReadFile(path)
 	if err != nil {

internal/manifests/collector/test-resources/jmxContainerInsightsConfig.json

@@ -0,0 +1,10 @@
+{
+  "logs": {
+    "metrics_collected": {
+      "kubernetes": {
+        "cluster_name": "TestCluster",
+        "jmx_container_insights": true
+      }
+    }
+  }
+}

pkg/instrumentation/defaultinstrumentation.go

@@ -159,8 +159,8 @@ func getJavaEnvs(isAppSignalsEnabled bool, cloudwatchAgentServiceEndpoint, expor
 	var jmxEnvs []corev1.EnvVar
 	if targetSystems, ok := additionalEnvs[jmx.EnvTargetSystem]; ok {
 		jmxEnvs = []corev1.EnvVar{
-			{Name: "OTEL_JMX_EXPORTER_METRICS_ENDPOINT", Value: fmt.Sprintf("%s://%s:4314/v1/metrics", http, cloudwatchAgentServiceEndpoint)},
-			{Name: "OTEL_JMX_ENABLED", Value: "true"},
+			{Name: "OTEL_AWS_JMX_EXPORTER_METRICS_ENDPOINT", Value: fmt.Sprintf("%s://%s:4314/v1/metrics", http, cloudwatchAgentServiceEndpoint)},
+			{Name: "OTEL_AWS_JMX_ENABLED", Value: "true"},
 			{Name: "OTEL_JMX_TARGET_SYSTEM", Value: targetSystems},
 		}
 	}

pkg/instrumentation/defaultinstrumentation_test.go

@@ -788,8 +788,8 @@ func Test_getDefaultInstrumentationLinuxWithApplicationSignalsDisabled(t *testin
 					{Name: "OTEL_EXPORTER_OTLP_PROTOCOL", Value: "http/protobuf"},
 					{Name: "OTEL_METRICS_EXPORTER", Value: "none"},
 					{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
-					{Name: "OTEL_JMX_EXPORTER_METRICS_ENDPOINT", Value: "http://cloudwatch-agent.amazon-cloudwatch:4314/v1/metrics"},
-					{Name: "OTEL_JMX_ENABLED", Value: "true"},
+					{Name: "OTEL_AWS_JMX_EXPORTER_METRICS_ENDPOINT", Value: "http://cloudwatch-agent.amazon-cloudwatch:4314/v1/metrics"},
+					{Name: "OTEL_AWS_JMX_ENABLED", Value: "true"},
 					{Name: "OTEL_JMX_TARGET_SYSTEM", Value: "jvm"},
 				},
 				Resources: corev1.ResourceRequirements{

pkg/instrumentation/podmutator_test.go

@@ -86,8 +86,8 @@ func TestGetInstrumentationInstanceJMX(t *testing.T) {
 				{Name: "OTEL_EXPORTER_OTLP_PROTOCOL", Value: "http/protobuf"},
 				{Name: "OTEL_METRICS_EXPORTER", Value: "none"},
 				{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
-				{Name: "OTEL_JMX_EXPORTER_METRICS_ENDPOINT", Value: "http://cloudwatch-agent.amazon-cloudwatch:4314/v1/metrics"},
-				{Name: "OTEL_JMX_ENABLED", Value: "true"},
+				{Name: "OTEL_AWS_JMX_EXPORTER_METRICS_ENDPOINT", Value: "http://cloudwatch-agent.amazon-cloudwatch:4314/v1/metrics"},
+				{Name: "OTEL_AWS_JMX_ENABLED", Value: "true"},
 				{Name: "OTEL_JMX_TARGET_SYSTEM", Value: "jvm,tomcat"},
 			},
 		},