chore: make java native instrumentations default for enterprise (#2174)

cli/cmd/resources/profiles.go

@@ -19,7 +19,7 @@ func GetAvailableCommunityProfiles() []k8sprofiles.Profile {
 
 func GetAvailableOnPremProfiles() []k8sprofiles.Profile {
 	return append([]k8sprofiles.Profile{k8sprofiles.FullPayloadCollectionProfile, k8sprofiles.DbPayloadCollectionProfile, k8sprofiles.CategoryAttributesProfile,
-		k8sprofiles.HostnameAsPodNameProfile, k8sprofiles.JavaNativeInstrumentationsProfile, k8sprofiles.KratosProfile, k8sprofiles.QueryOperationDetector,
+		k8sprofiles.HostnameAsPodNameProfile, k8sprofiles.JavaNativeInstrumentationsProfile, k8sprofiles.JavaEbpfInstrumentationsProfile, k8sprofiles.KratosProfile, k8sprofiles.QueryOperationDetector,
 		k8sprofiles.SmallBatchesProfile},
 		GetAvailableCommunityProfiles()...)
 }

cli/cmd/resources/profiles/java-ebpf-instrumentations.yaml

@@ -0,0 +1,12 @@
+apiVersion: odigos.io/v1alpha1
+kind: InstrumentationRule
+metadata:
+  name: java-ebpf-instrumentations
+spec:
+  ruleName: "java ebpf instrumentations"
+  notes: "Auto generated rule from java-ebpf-instrumentations profile. Do not edit."
+  otelSdks:
+    otelSdkByLanguage:
+      java:
+        sdkTier: "enterprise"
+        sdkType: "ebpf"

instrumentor/sdks/sdks.go

@@ -31,7 +31,7 @@ func otelSdkConfigCloud() map[common.ProgrammingLanguage]common.OtelSdk {
 
 func otelSdkConfigOnPrem() map[common.ProgrammingLanguage]common.OtelSdk {
 	return map[common.ProgrammingLanguage]common.OtelSdk{
-		common.JavaProgrammingLanguage:       common.OtelSdkEbpfEnterprise, // Notice - for onprem, the default for java is eBPF
+		common.JavaProgrammingLanguage:       common.OtelSdkNativeEnterprise,
 		common.PythonProgrammingLanguage:     common.OtelSdkEbpfEnterprise,
 		common.GoProgrammingLanguage:         common.OtelSdkEbpfEnterprise,
 		common.DotNetProgrammingLanguage:     common.OtelSdkNativeCommunity,

k8sutils/pkg/profiles/profile.go

@@ -74,7 +74,11 @@ var (
 	}
 	JavaNativeInstrumentationsProfile = Profile{
 		ProfileName:      common.ProfileName("java-native-instrumentations"),
-		ShortDescription: "Instrument Java applications using native instrumentation and eBPF enterprise processing",
+		ShortDescription: "Deprecated, native instrumentations are now enabled by default",
+	}
+	JavaEbpfInstrumentationsProfile = Profile{
+		ProfileName:      common.ProfileName("java-ebpf-instrumentations"),
+		ShortDescription: "Instrument Java applications using eBPF instrumentation and eBPF enterprise processing",
 		KubeObject:       &odigosv1alpha1.InstrumentationRule{},
 	}
 	CodeAttributesProfile = Profile{
@@ -92,8 +96,8 @@ var (
 	}
 	KratosProfile = Profile{
 		ProfileName:      common.ProfileName("kratos"),
-		ShortDescription: "Bundle profile that includes db-payload-collection, semconv, category-attributes, copy-scope, hostname-as-podname, java-native-instrumentations, code-attributes, query-operation-detector, disableNameProcessorProfile, small-batches, size_m, allow_concurrent_agents",
-		Dependencies:     []common.ProfileName{"db-payload-collection", "semconv", "category-attributes", "copy-scope", "hostname-as-podname", "java-native-instrumentations", "code-attributes", "query-operation-detector", "disableNameProcessorProfile", "small-batches", "size_m", "allow_concurrent_agents"},
+		ShortDescription: "Bundle profile that includes db-payload-collection, semconv, category-attributes, copy-scope, hostname-as-podname, code-attributes, query-operation-detector, disableNameProcessorProfile, small-batches, size_m, allow_concurrent_agents",
+		Dependencies:     []common.ProfileName{"db-payload-collection", "semconv", "category-attributes", "copy-scope", "hostname-as-podname", "code-attributes", "query-operation-detector", "disableNameProcessorProfile", "small-batches", "size_m", "allow_concurrent_agents"},
 	}
 	ProfilesMap = map[common.ProfileName]Profile{
 		SizeSProfile.ProfileName:                      SizeSProfile,
@@ -107,6 +111,7 @@ var (
 		CopyScopeProfile.ProfileName:                  CopyScopeProfile,
 		HostnameAsPodNameProfile.ProfileName:          HostnameAsPodNameProfile,
 		JavaNativeInstrumentationsProfile.ProfileName: JavaNativeInstrumentationsProfile,
+		JavaEbpfInstrumentationsProfile.ProfileName:   JavaEbpfInstrumentationsProfile,
 		CodeAttributesProfile.ProfileName:             CodeAttributesProfile,
 		DisableNameProcessorProfile.ProfileName:       DisableNameProcessorProfile,
 		SmallBatchesProfile.ProfileName:               SmallBatchesProfile,