Skip to content

Commit 7698ea6

Browse files
umanwizardumanwizard
authored
Merge main-next to main (#226)
This rebases the delta in our fork of opentelemetry-ebpf-profiler on top of upstream main. It will eventually become our main once we let it bake for a while to gain confidence in its correctness. This PR replaces #209, which had the draft branch name `btv/merges`.
1 parent 579a830 commit 7698ea6

399 files changed

Lines changed: 19880 additions & 9781 deletions

File tree

Some content is hidden

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

‎.codespellignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
ba
2+
crate
23
fo
4+
mapp
35
opne
46
optimyze
7+
prevEnd
8+
iself
9+
wit
10+
ALS
11+
als
12+
checkin

‎.codespellrc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ builtin = clear,rare,informal
44
check-filenames =
55
check-hidden =
66
ignore-words = .codespellignore
7-
interactive = 1
8-
skip = .git,AUTHORS.md,go.mod,go.sum,LICENSES,zydis
7+
ignore-regex = \b[a-z]+[A-Z][a-zA-Z0-9]*\b|\b[a-z_]+_[a-z_]+\b|\b0x[0-9a-fA-F]+\b|^\s*(package|import|use|include|#include)\s
8+
interactive = 0
9+
skip = .git,AUTHORS.md,go.mod,go.sum,LICENSES,zydis,tools.mod,tools.sum
910
uri-ignore-words-list = *
10-
write =

‎.github/CODEOWNERS‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,20 @@
1414

1515
* @open-telemetry/ebpf-profiler-maintainers @open-telemetry/ebpf-profiler-approvers
1616

17-
CODEOWNERS @open-telemetry/ebpf-profiler-maintainers
17+
#####################################################
18+
#
19+
# List of BEAM interpreter code owners
20+
#
21+
#####################################################
22+
23+
interpreter/beam/ @open-telemetry/ebpf-profiler-approvers @GregMefford
24+
support/ebpf/beam_tracer.ebpf.c @open-telemetry/ebpf-profiler-approvers @GregMefford
25+
26+
#####################################################
27+
#
28+
# List of Ruby interpreter code owners
29+
#
30+
#####################################################
31+
32+
interpreter/ruby/ @open-telemetry/ebpf-profiler-approvers @dalehamel
33+
support/ebpf/ruby_tracer.ebpf.c @open-telemetry/ebpf-profiler-approvers @dalehamel

‎.github/renovate.json5‎

Lines changed: 69 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,82 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:best-practices",
5-
"helpers:pinGitHubActionDigestsToSemver"
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
66
],
7-
"postUpdateOptions" : [
8-
"gomodTidy"
7+
postUpdateOptions: [
8+
'gomodTidy',
99
],
10-
"packageRules": [
10+
ignorePaths: [
11+
'LICENSES/**',
12+
],
13+
gomod: {
14+
managerFilePatterns: [
15+
'/(^|/)tools\\.mod$/',
16+
],
17+
},
18+
ocb: {
19+
managerFilePatterns: [
20+
'/cmd/otelcol-ebpf-profiler/manifest.yaml$/',
21+
],
22+
},
23+
packageRules: [
24+
{
25+
groupName: 'Go dependencies',
26+
matchManagers: [
27+
'gomod',
28+
],
29+
schedule: [
30+
'before 8am every weekday',
31+
],
32+
automerge: true,
33+
},
1134
{
12-
"groupName": "Go dependencies",
13-
"matchManagers": ["gomod"],
14-
"schedule": ["before 8am every weekday"],
15-
"automerge": true
35+
groupName: 'Docker related dependencies',
36+
matchManagers: [
37+
'buildpacks',
38+
'devcontainer',
39+
'docker-compose',
40+
'dockerfile',
41+
],
42+
schedule: [
43+
'before 8am every weekday',
44+
],
45+
automerge: true,
1646
},
1747
{
18-
"groupName": "Docker related dependencies",
19-
"matchManagers": ["buildpacks", "devcontainer", "docker-compose", "dockerfile"],
20-
"schedule": ["before 8am every weekday"],
21-
"automerge": true
48+
groupName: 'GitHub Actions',
49+
matchManagers: [
50+
'github-actions',
51+
],
52+
schedule: [
53+
'before 8am every weekday',
54+
],
55+
automerge: true,
2256
},
2357
{
24-
"groupName": "GitHub Actions",
25-
"matchManagers": ["github-actions"],
26-
"schedule": ["before 8am every weekday"],
27-
"automerge": true
58+
groupName: 'Rust dependencies',
59+
matchManagers: [
60+
'cargo',
61+
],
62+
schedule: [
63+
'before 8am every weekday',
64+
],
2865
},
2966
{
30-
"groupName": "Rust dependencies",
31-
"matchManagers": ["cargo"],
32-
"schedule": ["before 8am every weekday"]
33-
}
67+
groupName: 'OCB (manifest) dependencies',
68+
matchManagers: [
69+
'ocb',
70+
],
71+
schedule: [
72+
'before 8am every weekday',
73+
],
74+
},
75+
],
76+
ignoreDeps: [
77+
'golangci/golangci-lint-action',
3478
],
35-
"ignoreDeps": [
36-
"golangci/golangci-lint-action"
79+
labels: [
80+
'dependencies',
3781
],
38-
"labels": [
39-
"dependencies"
40-
]
4182
}

‎.github/workflows/add-codeowners-to-pr.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 'Add code owners to a PR'
2+
on:
3+
pull_request_target:
4+
types:
5+
- opened
6+
- synchronize
7+
- ready_for_review
8+
9+
permissions: read-all
10+
11+
jobs:
12+
add-owners-to-pr:
13+
permissions:
14+
pull-requests: write
15+
runs-on: ubuntu-24.04
16+
if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'open-telemetry' && github.event.pull_request.draft == false }}
17+
steps:
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
20+
- name: Run add-codeowners-to-pr.sh
21+
run: ./.github/workflows/scripts/add-codeowners-to-pr.sh
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
REPO: ${{ github.repository }}
25+
PR: ${{ github.event.number }}

‎.github/workflows/auto-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919

2020
- name: Configure Git
2121
run: |

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,26 @@ jobs:
1414
analyze:
1515
permissions:
1616
security-events: write # for github/codeql-action/analyze to upload SARIF results
17-
name: Analyze Go (${{ matrix.target_arch }})
17+
name: Analyze Go
1818
if: ${{ github.actor != 'dependabot[bot]' && github.repository == 'open-telemetry/opentelemetry-ebpf-profiler' }}
19-
runs-on: ubuntu-24.04
20-
strategy:
21-
matrix:
22-
target_arch: [amd64, arm64]
19+
runs-on: ubuntu-24.04 # CodeQL CLI only supports x86_64 Linux
2320
steps:
2421
- name: Checkout repository
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2623

2724
- name: Set up environment
2825
uses: ./.github/workflows/env
2926

3027
- name: Initialize CodeQL
31-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
28+
uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
3229
with:
3330
languages: go
3431

3532
- name: Build Artifact
36-
run: |
37-
make TARGET_ARCH=${{ matrix.target_arch }}
33+
run: make
3834

3935
- name: Perform CodeQL Analysis
40-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
36+
uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
4137
with:
4238
category: "/language:Go"
4339
timeout-minutes: 10

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- name: Install codespell
1414
run: sudo apt-get install codespell
1515
- name: Checkout Repo
16-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1717
- name: Codespell
1818
run: make codespell

‎.github/workflows/collector-tests.yml‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
schedule:
55
# Run every day at 3:15 AM.
66
- cron: '15 3 * * *'
7+
pull_request:
8+
branches: ["**"]
9+
paths:
10+
- cmd/otelcol-ebpf-profiler/manifest.yaml
711

812
concurrency:
913
group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -18,13 +22,15 @@ jobs:
1822
runs-on: ubuntu-latest
1923
steps:
2024
- name: Checkout Repo
21-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2226
- name: Set up environment
2327
uses: ./.github/workflows/env
28+
- name: Set up Go Stable
29+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
2430
with:
25-
skip_rust: true
31+
go-version: stable
2632
- name: Cache coredump modules
27-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
33+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2834
with:
2935
path: tools/coredump/modulecache
3036
key: coredumps-collector-${{ hashFiles('tools/coredump/testdata/*/*.json') }}
@@ -39,12 +45,52 @@ jobs:
3945
run: |
4046
COLLECTOR_PATH=/tmp/opentelemetry-collector ./support/local-collector.sh
4147
go mod tidy
48+
- name: Install dependencies
49+
run: |
50+
sudo apt-get update -y
51+
sudo apt-get install -y debootstrap systemtap-sdt-dev
4252
- name: Tests
4353
run: make test-junit
4454
- name: Generate Issue
4555
if: failure()
4656
env:
4757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4858
run: |
49-
go install go.opentelemetry.io/build-tools/issuegenerator@latest
59+
go install go.opentelemetry.io/build-tools/issuegenerator@v0.28.1
60+
issuegenerator -path /tmp/testresults
61+
62+
otelcol-ebpf-profiler:
63+
strategy:
64+
matrix:
65+
include:
66+
- { runner: ubuntu-24.04, use-upstream: true }
67+
- { runner: ubuntu-24.04, use-upstream: false }
68+
- { runner: ubuntu-24.04-arm, use-upstream: true }
69+
- { runner: ubuntu-24.04-arm, use-upstream: false }
70+
runs-on: ${{ matrix.runner }}
71+
steps:
72+
- name: Checkout Repo
73+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
74+
- name: Set up Go Stable
75+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
76+
with:
77+
go-version: stable
78+
- name: Clone Collector
79+
if: ${{ matrix.use-upstream }}
80+
run: |
81+
collector_path=/tmp/opentelemetry-collector
82+
git clone --depth=1 https://github.com/open-telemetry/opentelemetry-collector.git $collector_path
83+
- name: Setup replace statements
84+
if: ${{ matrix.use-upstream }}
85+
run: |
86+
COLLECTOR_PATH=/tmp/opentelemetry-collector make otel-from-tree
87+
- name: Build otelcol-ebpf-profiler
88+
run: |
89+
make otelcol-ebpf-profiler
90+
- name: Generate Issue
91+
if: failure()
92+
env:
93+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
94+
run: |
95+
go install go.opentelemetry.io/build-tools/issuegenerator@v0.28.1
5096
issuegenerator -path /tmp/testresults

0 commit comments

Comments
 (0)