Skip to content

Disable IP options by default #1001

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

Merged
grcevski merged 2 commits into from
Dec 12, 2025
Merged

Disable IP options by default #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99660e5
Disable IP options by default
rafaelroquetto Dec 12, 2025
1609de4
Fix test
rafaelroquetto Dec 12, 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
9 changes: 4 additions & 5 deletions .github/workflows/workflow_integration_tests_vm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ jobs:
- name: build matrix
id: build-matrix
env:
# 6 partitions, one for each of:
# 5 partitions, one for each of:
# 1. TestMultiProcess
# 2. TestMultiProcessAppCP
# 3. TestMultiProcessAppCPNoIP
# 3. TestMultiProcessAppCPHeadersOnly
# 4. TestMultiProcessAppCPTCPOnly
# 5. TestMultiProcessAppCPHeadersAndTCP
# 6. TestMultiProcessAppCPIPOnly
# 5. TestMultiProcessAppCPIPOnly

PARTITIONS: 6
PARTITIONS: 5
TEST_TAGS: integration
run: |
echo -n "matrix=" >> $GITHUB_OUTPUT
Expand Down
18 changes: 1 addition & 17 deletions internal/test/integration/multiprocess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func TestMultiProcessAppCP(t *testing.T) {
require.NoError(t, compose.Close())
}

func TestMultiProcessAppCPNoIP(t *testing.T) {
func TestMultiProcessAppCPHeadersOnly(t *testing.T) {
compose, err := docker.ComposeSuite("docker-compose-multiexec-host.yml", path.Join(pathOutput, "test-suite-multiexec-app-cp-no-ip.log"))
require.NoError(t, err)

Expand Down Expand Up @@ -161,22 +161,6 @@ func TestMultiProcessAppCPTCPOnly(t *testing.T) {
require.NoError(t, compose.Close())
}

func TestMultiProcessAppCPHeadersAndTCP(t *testing.T) {
compose, err := docker.ComposeSuite("docker-compose-multiexec-host.yml", path.Join(pathOutput, "test-suite-multiexec-app-cp-headers-tcp.log"))
require.NoError(t, err)

// Test combined headers and TCP context propagation
compose.Env = append(compose.Env, `OTEL_EBPF_BPF_DISABLE_BLACK_BOX_CP=1`, `OTEL_EBPF_BPF_CONTEXT_PROPAGATION=headers,tcp`, `OTEL_EBPF_BPF_TRACK_REQUEST_HEADERS=1`)

require.NoError(t, compose.Up())

t.Run("Nested traces with headers and TCP propagation", func(t *testing.T) {
testNestedHTTPTracesKProbes(t)
})

require.NoError(t, compose.Close())
}

func TestMultiProcessAppCPIPOnly(t *testing.T) {
compose, err := docker.ComposeSuite("docker-compose-multiexec-host.yml", path.Join(pathOutput, "test-suite-multiexec-app-cp-ip-only.log"))
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/ebpf_tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ const (
ContextPropagationDisabled ContextPropagationMode = 0
ContextPropagationHeaders ContextPropagationMode = 1 << 0 // HTTP headers
ContextPropagationTCP ContextPropagationMode = 1 << 1 // TCP options
ContextPropagationIPOptions ContextPropagationMode = 1 << 2 // IP options
ContextPropagationIPOptions ContextPropagationMode = 1 << 2 // IP options (dangerous)

// Convenience aliases
ContextPropagationAll = ContextPropagationHeaders | ContextPropagationTCP | ContextPropagationIPOptions
ContextPropagationAll = ContextPropagationHeaders | ContextPropagationTCP
)

// EBPFTracer configuration for eBPF programs
Expand Down
12 changes: 6 additions & 6 deletions pkg/config/ebpf_tracer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ func TestContextPropagationMode_UnmarshalText(t *testing.T) {
want: ContextPropagationHeaders | ContextPropagationIPOptions,
},
{
name: "all three",
input: "headers,tcp,ip",
name: "all two",
input: "headers,tcp",
want: ContextPropagationAll,
},
{
name: "with spaces",
input: " headers , tcp , ip ",
want: ContextPropagationAll,
want: ContextPropagationHeaders | ContextPropagationTCP | ContextPropagationIPOptions,
},
{
name: "invalid value",
Expand Down Expand Up @@ -133,7 +133,7 @@ func TestContextPropagationMode_MarshalText(t *testing.T) {
{
name: "headers and tcp",
mode: ContextPropagationHeaders | ContextPropagationTCP,
want: "headers,tcp",
want: "all",
},
{
name: "tcp and ip",
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestContextPropagationMode_HasMethods(t *testing.T) {
mode: ContextPropagationAll,
wantHeaders: true,
wantTCP: true,
wantIPOptions: true,
wantIPOptions: false,
wantIsEnabled: true,
},
{
Expand Down Expand Up @@ -290,7 +290,7 @@ func TestContextPropagationMode_TracerLoading(t *testing.T) {
name: "all",
mode: ContextPropagationAll,
wantTPInject: true,
wantTCTracer: true,
wantTCTracer: false,
},
{
name: "disabled",
Expand Down
2 changes: 1 addition & 1 deletion pkg/obi/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ func TestWillUseTC(t *testing.T) {

env = envMap{"OTEL_EBPF_BPF_CONTEXT_PROPAGATION": "all"}
cfg = loadConfig(t, env)
assert.True(t, cfg.willUseTC())
assert.False(t, cfg.willUseTC())

env = envMap{"OTEL_EBPF_BPF_CONTEXT_PROPAGATION": "headers"}
cfg = loadConfig(t, env)
Expand Down
Loading