debug

grafana · Feb 20, 2025 · c20badd · c20badd
1 parent d70346e
commit c20badd
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 97 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        arch: [amd64, arm64, ppc64le, s390x]
+        #arch: [amd64, arm64, ppc64le, s390x]
+        arch: [amd64]
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -33,96 +34,96 @@ jobs:
     - run: make generate-ui
     - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= make alloy
 
-  build_linux_boringcrypto:
-    name: Build on Linux (boringcrypto)
-    runs-on: ubuntu-latest
-    container: grafana/alloy-build-image:v0.1.8-boringcrypto
-    strategy:
-      matrix:
-        os: [linux]
-        arch: [amd64, arm64]
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set ownership
-      # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
-      run: |
-          # this is to fix GIT not liking owner of the checkout dir
-          chown -R $(id -u):$(id -g) $PWD
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
-        cache: false
-    - run: make generate-ui
-    - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy
-
-  build_mac_intel:
-    name: Build on MacOS (Intel)
-    runs-on: macos-14-large
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
-        cache: false
-    - run: make generate-ui
-    - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
-
-  build_mac_arm:
-    name: Build on MacOS (ARM)
-    runs-on: macos-14-xlarge
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
-        cache: false
-    - run: make generate-ui
-    - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
+#  build_linux_boringcrypto:
+#    name: Build on Linux (boringcrypto)
+#    runs-on: ubuntu-latest
+#    container: grafana/alloy-build-image:v0.1.8-boringcrypto
+#    strategy:
+#      matrix:
+#        os: [linux]
+#        arch: [amd64, arm64]
+#    steps:
+#    - name: Checkout code
+#      uses: actions/checkout@v4
+#    - name: Set ownership
+#      # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
+#      run: |
+#          # this is to fix GIT not liking owner of the checkout dir
+#          chown -R $(id -u):$(id -g) $PWD
+#    - name: Set up Go
+#      uses: actions/setup-go@v5
+#      with:
+#        go-version-file: go.mod
+#        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
+#        cache: false
+#    - run: make generate-ui
+#    - run: GO_TAGS="builtinassets promtail_journal_enabled" GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} GOARM= GOEXPERIMENT=boringcrypto make alloy
+#
+  #build_mac_intel:
+  #  name: Build on MacOS (Intel)
+  #  runs-on: macos-14-large
+  #  steps:
+  #  - name: Checkout code
+  #    uses: actions/checkout@v4
+  #  - name: Set up Go
+  #    uses: actions/setup-go@v5
+  #    with:
+  #      go-version-file: go.mod
+  #      # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
+  #      cache: false
+  #  - run: make generate-ui
+  #  - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
+  #
+  #build_mac_arm:
+  #  name: Build on MacOS (ARM)
+  #  runs-on: macos-14-xlarge
+  #  steps:
+  #  - name: Checkout code
+  #    uses: actions/checkout@v4
+  #  - name: Set up Go
+  #    uses: actions/setup-go@v5
+  #    with:
+  #      go-version-file: go.mod
+  #      # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
+  #      cache: false
+  #  - run: make generate-ui
+  #  - run: GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
 
-  build_windows:
-    name: Build on Windows (AMD64)
-    runs-on: windows-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
-        cache: false
-    - run: make generate-ui
-    - run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append
-    - run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append
-    - run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append
-    - run: make alloy
+  #build_windows:
+  #  name: Build on Windows (AMD64)
+  #  runs-on: windows-latest
+  #  steps:
+  #  - name: Checkout code
+  #    uses: actions/checkout@v4
+  #  - name: Set up Go
+  #    uses: actions/setup-go@v5
+  #    with:
+  #      go-version-file: go.mod
+  #      # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
+  #      cache: false
+  #  - run: make generate-ui
+  #  - run: echo "GO_TAGS=builtinassets" | Out-File -FilePath $env:GITHUB_ENV -Append
+  #  - run: echo "GOOS=windows" | Out-File -FilePath $env:GITHUB_ENV -Append
+  #  - run: echo "GOARCH=amd64" | Out-File -FilePath $env:GITHUB_ENV -Append
+  #  - run: make alloy
 
-  build_freebsd:
-    name: Build on FreeBSD (AMD64)
-    runs-on: ubuntu-latest
-    container: grafana/alloy-build-image:v0.1.8
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Set ownership
-      # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
-      run: |
-          # this is to fix GIT not liking owner of the checkout dir
-          chown -R $(id -u):$(id -g) $PWD
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
-        cache: false
-    - run: make generate-ui
-    - run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
+  #build_freebsd:
+  #  name: Build on FreeBSD (AMD64)
+  #  runs-on: ubuntu-latest
+  #  container: grafana/alloy-build-image:v0.1.8
+  #  steps:
+  #  - name: Checkout code
+  #    uses: actions/checkout@v4
+  #  - name: Set ownership
+  #    # https://github.com/actions/runner/issues/2033#issuecomment-1204205989
+  #    run: |
+  #        # this is to fix GIT not liking owner of the checkout dir
+  #        chown -R $(id -u):$(id -g) $PWD
+  #  - name: Set up Go
+  #    uses: actions/setup-go@v5
+  #    with:
+  #      go-version-file: go.mod
+  #      # TODO: Try enabling caching later. It might use up too much disk space on runners so needs extra testing.
+  #      cache: false
+  #  - run: make generate-ui
+  #  - run: GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
diff --git a/Makefile b/Makefile
@@ -280,8 +280,11 @@ drone: generate-drone
 # Alloy binary
 .PHONY: generate-beyla
 generate-beyla:
-	@go mod vendor
-	@GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go generate vendor/github.com/grafana/beyla/v2/bpf/build_ebpf.go > /dev/null
+	echo current dir is
+	pwd
+	ls -ld `pwd`
+	go mod vendor
+	GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go generate vendor/github.com/grafana/beyla/v2/bpf/build_ebpf.go
 
 .PHONY: clean
 clean: clean-dist clean-build-container-cache

diff --git a/go.mod b/go.mod
@@ -893,7 +893,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-require github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705
+require github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101
 
 // NOTE: replace directives below must always be *temporary*.
 //

diff --git a/go.sum b/go.sum
@@ -1248,8 +1248,8 @@ github.com/gosnmp/gosnmp v1.38.0/go.mod h1:FE+PEZvKrFz9afP9ii1W3cprXuVZ17ypCcyyf
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/grafana/alloy-remote-config v0.0.10 h1:1Ge7lz2mjXI1rd6SmiZpFHyXeLehBuCi43+XTkdqgV4=
 github.com/grafana/alloy-remote-config v0.0.10/go.mod h1:kHE1usYo2WAVCikQkIXuoG1Clz8BSdiz3kF+DZSCQ4k=
-github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705 h1:hRKODZCnUXYG2/m9pdzKWtEZgzDhAXNaJ6Nhr8MwwJg=
-github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705/go.mod h1:MKNkPychrqv6FKK6yI3i3Eqn4QNBGJY9hZGeO7Su+ck=
+github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101 h1:lN7fi17kAM8sApNlOGG/KO5M8egjTXUtWqmcdFCGQwk=
+github.com/grafana/beyla/v2 v2.0.1-0.20250220180606-8a2fd0c82101/go.mod h1:MKNkPychrqv6FKK6yI3i3Eqn4QNBGJY9hZGeO7Su+ck=
 github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg185ETtFCKj5WzaQ48qfkbsSRRQrF4=
 github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g=
 github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4=