debug

Author: mmat11

.github/workflows/cx-internal-build-push.yml

@@ -0,0 +1,69 @@
+name: CX build and push
+
+on:
+  push:
+    branches: [ 'main', 'matt/bpf-loop-fallback' ]
+  pull_request:
+    branches: [ 'matt/bpf-loop-fallback' ]
+
+env:
+  AWS_REGION: eu-west-1
+  AWS_ACCOUNT_ID: 897729105761 # tacotaco-research
+  AWS_ROLE_TO_ASSUME: arn:aws:iam::897729105761:role/AnemiaAgentRole
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    if: github.repository == 'coralogix/opentelemetry-ebpf-instrumentation'
+    permissions:
+      id-token: write
+      packages: write
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ env.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        run: |
+          aws ecr get-login-password --region ${{ env.AWS_REGION }} | docker login --username AWS --password-stdin ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
+
+      - name: Create ECR Repositories
+        run: |
+          aws ecr create-repository --repository-name "obi-internal" --region ${{ env.AWS_REGION }} || echo "Repository obi-internal already exists."
+
+      - name: Set up buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+
+      - name: Cache images
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Set Git Commit Hash
+        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/obi-internal:${{ env.COMMIT_HASH }}
+            ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/obi-internal:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache,new=true

bpf/common/trace_common.h

@@ -55,7 +55,7 @@ static __always_inline void trace_key_from_pid_tid(trace_key_t *t_key) {
     t_key->extra_id = extra_id;
 }
 
-static __hidden int tp_match(u32 index, void *data) {
+static int tp_match(u32 index, void *data) {
     if (index >= (TRACE_BUF_SIZE - TRACE_PARENT_HEADER_LEN)) {
         return 1;
     }
@@ -94,9 +94,8 @@ static __always_inline unsigned char *bpf_strstr_tp_loop__legacy(unsigned char *
         return NULL;
     }
 
-    const u16 k_besteffort_max_loops = 450; // Limit search to avoid burning too many instructions
+    const u16 k_besteffort_max_loops = 450; // Limited search to avoid burning too many instructions
     for (u16 i = 0; i + TRACE_PARENT_HEADER_LEN < k_besteffort_max_loops; i++) {
-        // Only check at offset=0 or after '\n' to save instructions
         if (i != 0 && buf[i - 1] != '\n') {
             continue;
         }

pkg/components/ebpf/generictracer/generictracer.go

@@ -149,7 +149,15 @@ func (p *Tracer) Load() (*ebpf.CollectionSpec, error) {
 		p.log.Info("Enabling trace information parsing", "bpf_loop_enabled", ebpfcommon.SupportsEBPFLoops(p.log, p.cfg.EBPF.OverrideBPFLoopEnabled))
 	}
 
-	return loader()
+	spec, err := loader()
+	if err != nil {
+		fmt.Println("GREPME: Error loading BPF objects: ", err)
+	} else {
+		culprit := spec.Programs["obi_protocol_http"]
+		fmt.Println("GREPME refs: ", culprit.Instructions.FunctionReferences(), len(culprit.Instructions.FunctionReferences()))
+	}
+
+	return spec, err
 }
 
 func (p *Tracer) SetupTailCalls() {