Skip to content

Commit

Permalink
revert: instrumentatiom devices for enterprise distros (#2429)
Browse files Browse the repository at this point in the history
  • Loading branch information
blumamir authored Feb 11, 2025
1 parent c527aab commit 730cdc5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion distros/yamls/java-ebpf-instrumentations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ spec:
delimiter: ' '
runtimeAgent:
directoryNames:
- "{{ODIGOS_AGENTS_DIR}}/java-ebpf"
# - "{{ODIGOS_AGENTS_DIR}}/java-ebpf"
2 changes: 1 addition & 1 deletion distros/yamls/nodejs-enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ spec:
delimiter: ' '
runtimeAgent:
directoryNames:
- "{{ODIGOS_AGENTS_DIR}}/nodejs-ebpf"
# - "{{ODIGOS_AGENTS_DIR}}/nodejs-ebpf"
8 changes: 5 additions & 3 deletions instrumentor/controllers/agentenabled/pods_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,11 @@ func (p *PodsWebhook) injectOdigosInstrumentation(ctx context.Context, pod *core
}

// amir: 07 feb 2025. hard-coded temporary list which is removed once all distros migrate away from device
if (runtimeDetails.Language == common.JavascriptProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) ||
(runtimeDetails.Language == common.GoProgrammingLanguage && otelSdk == common.OtelSdkEbpfCommunity) ||
(runtimeDetails.Language == common.JavaProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) ||
// amir: 11 feb 2025. reverted java and nodejs enterprise temporarily
if
// (runtimeDetails.Language == common.JavascriptProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) ||
(runtimeDetails.Language == common.GoProgrammingLanguage && otelSdk == common.OtelSdkEbpfCommunity) ||
// (runtimeDetails.Language == common.JavaProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) ||
(runtimeDetails.Language == common.MySQLProgrammingLanguage && otelSdk == common.OtelSdkEbpfEnterprise) {
// Skip device injection for distros that no longer use it
} else {
Expand Down

0 comments on commit 730cdc5

Please sign in to comment.