Skip to content

Commit bc7cff2

Browse files
authored
Merge branch 'main' into deprecate_fields
2 parents 91d0c0a + cf94133 commit bc7cff2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2464
-834
lines changed

Diff for: .github/workflows/doc-validator.yml

-27
This file was deleted.

Diff for: .github/workflows/pull_request_oats_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
test:
1111
name: test
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-latest-8-cores
1313
strategy:
1414
matrix:
1515
go: [ '1.23' ]

Diff for: Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -341,22 +341,22 @@ oats-prereq: bin/ginkgo docker-generate
341341
.PHONY: oats-test-sql
342342
oats-test-sql: oats-prereq
343343
mkdir -p test/oats/sql/$(TEST_OUTPUT)/run
344-
cd test/oats/sql && TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
344+
cd test/oats/sql && TESTCASE_TIMEOUT=5m TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
345345

346346
.PHONY: oats-test-redis
347347
oats-test-redis: oats-prereq
348348
mkdir -p test/oats/redis/$(TEST_OUTPUT)/run
349-
cd test/oats/redis && TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
349+
cd test/oats/redis && TESTCASE_TIMEOUT=5m TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
350350

351351
.PHONY: oats-test-kafka
352352
oats-test-kafka: oats-prereq
353353
mkdir -p test/oats/kafka/$(TEST_OUTPUT)/run
354-
cd test/oats/kafka && TESTCASE_TIMEOUT=120s TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
354+
cd test/oats/kafka && TESTCASE_TIMEOUT=5m TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
355355

356356
.PHONY: oats-test-http
357357
oats-test-http: oats-prereq
358358
mkdir -p test/oats/http/$(TEST_OUTPUT)/run
359-
cd test/oats/http && TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
359+
cd test/oats/http && TESTCASE_TIMEOUT=5m TESTCASE_BASE_PATH=./yaml $(GINKGO) -v -r
360360

361361
.PHONY: oats-test
362362
oats-test: oats-test-sql oats-test-redis oats-test-kafka oats-test-http
@@ -399,3 +399,7 @@ protoc-gen:
399399
clang-format:
400400
find ./bpf -type f -name "*.c" | xargs -P 0 -n 1 clang-format -i
401401
find ./bpf -type f -name "*.h" | xargs -P 0 -n 1 clang-format -i
402+
403+
.PHONY: clean-ebpf-generated-files
404+
clean-ebpf-generated-files:
405+
find . -name "*_bpfel*" | xargs rm

Diff for: bpf/bpf_dbg.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ enum bpf_func_id___x { BPF_FUNC_snprintf___x = 42 /* avoid zero */ };
7272
bpf_dbg_helper(fmt, ##args); \
7373
}
7474
#define bpf_d_printk(fmt, args...) \
75-
{ bpf_printk(fmt, ##args); }
75+
{ \
76+
bpf_printk(fmt, ##args); \
77+
}
7678
#else
7779
#define bpf_dbg_printk(fmt, args...)
7880
#define bpf_d_printk(fmt, args...)

0 commit comments

Comments
 (0)