updating env vars

Author: mitali-salvi

pkg/instrumentation/defaultinstrumentation.go

@@ -160,7 +160,6 @@ func getJavaEnvs(isAppSignalsEnabled bool, cloudwatchAgentServiceEndpoint, expor
 	if targetSystems, ok := additionalEnvs[jmx.EnvTargetSystem]; ok {
 		jmxEnvs = []corev1.EnvVar{
 			{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

@@ -789,7 +789,6 @@ func Test_getDefaultInstrumentationLinuxWithApplicationSignalsDisabled(t *testin
 					{Name: "OTEL_METRICS_EXPORTER", Value: "none"},
 					{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
 					{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

@@ -81,13 +81,12 @@ func TestGetInstrumentationInstanceJMX(t *testing.T) {
 				},
 			},
 			ns:      corev1.Namespace{},
-			wantLen: 6,
+			wantLen: 5,
 			wantEnv: []corev1.EnvVar{
 				{Name: "OTEL_EXPORTER_OTLP_PROTOCOL", Value: "http/protobuf"},
 				{Name: "OTEL_METRICS_EXPORTER", Value: "none"},
 				{Name: "OTEL_LOGS_EXPORTER", Value: "none"},
 				{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"},
 			},
 		},