Merge branch 'main' into main

open-telemetry · Sep 3, 2024 · 95569c7 · 95569c7
2 parents 40dcc89 + 21df659
commit 95569c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dev/devbox/source/k8s/modify.sh b/dev/devbox/source/k8s/modify.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 function print_help {
-  echo "usage: $0 [--ebfp-net|--otel-demo] <YAML_FILE>"
+  echo "usage: $0 [--ebpf-net|--otel-demo] <YAML_FILE>"
   echo "  --ebpf-net: modify previously deployed OpenTelementry eBPF component(s)"
   echo "  --ebpf-net-local-helm-chart | -C: use local helm chart to modify OpenTelementry eBPF component(s)"
   echo "                                    (default is to use public splunk-otel-collector-chart/splunk-otel-collector)"

diff --git a/docs/dns-and-http.md b/docs/dns-and-http.md
@@ -10,7 +10,7 @@ This document describes how DNS collection and enrichment works.
 
 #### Kernel space
 
-Collector's eBFP code gathers DNS data by hooking into kernel UDP send functions \(for reference, see where `perf_check_and_submit_dns` function is called from\). Captured UDP send buffer data \(`skb->data`\) are relayed to the user space through perf ring messages. The maximum captured UDP data size is limited to 512 bytes \(maximum DNS UDP packet message size specified in the RFC\). We currently do not support DNS over HTTP.
+Collector's eBPF code gathers DNS data by hooking into kernel UDP send functions \(for reference, see where `perf_check_and_submit_dns` function is called from\). Captured UDP send buffer data \(`skb->data`\) are relayed to the user space through perf ring messages. The maximum captured UDP data size is limited to 512 bytes \(maximum DNS UDP packet message size specified in the RFC\). We currently do not support DNS over HTTP.
 
 #### User space