Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make java native instrumentations default for enterprise #2174

Merged
merged 5 commits into from
Jan 10, 2025
Merged

chore: make java native instrumentations default for enterprise #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6adccea
chore: make java native instrumentations default for enterprise
blumamir Jan 9, 2025
e5fbb43
Merge remote-tracking branch 'upstream/main' into java-native-default
blumamir Jan 9, 2025
269245a
revert: bring back java-native-instrumentation that does nothing
blumamir Jan 10, 2025
cae534e
Merge remote-tracking branch 'upstream/main' into java-native-default
blumamir Jan 10, 2025
4ea5d20
Merge branch 'main' into java-native-default
blumamir Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/cmd/resources/profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()...)
}
Expand Down
12 changes: 12 additions & 0 deletions cli/cmd/resources/profiles/java-ebpf-instrumentations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
12 changes: 0 additions & 12 deletions cli/cmd/resources/profiles/java-native-instrumentations.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion instrumentor/sdks/sdks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 8 additions & 3 deletions k8sutils/pkg/profiles/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading