Skip to content

Commit 19a5d8c

Browse files
authored
Merge branch 'main' into exporter-metrics
2 parents f6de494 + eed100c commit 19a5d8c

File tree

138 files changed

+12775
-1238
lines changed

Some content is hidden

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

138 files changed

+12775
-1238
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
sdk-benchmarks:
1212
permissions:
1313
contents: write # required for pushing to gh-pages
14-
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
14+
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1515
container:
1616
image: python:3.13-slim
1717
steps:

.github/workflows/check-links.yml

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,48 @@ name: check-links
22
on:
33
push:
44
branches: [ main ]
5+
paths:
6+
- '**/*.md'
7+
- '.github/workflows/check-links.yml'
8+
- '.github/workflows/check_links_config.json'
59
pull_request:
10+
paths:
11+
- '**/*.md'
12+
- '.github/workflows/check-links.yml'
13+
- '.github/workflows/check_links_config.json'
614

715
permissions:
816
contents: read
917

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
20+
cancel-in-progress: true
21+
1022
jobs:
11-
changedfiles:
12-
name: changed files
13-
runs-on: ubuntu-latest
14-
if: ${{ github.actor != 'dependabot[bot]' }}
15-
outputs:
16-
md: ${{ steps.changes.outputs.md }}
17-
steps:
18-
- name: Checkout Repo
19-
uses: actions/checkout@v4
20-
with:
21-
fetch-depth: 0
22-
- name: Get changed files
23-
id: changes
24-
run: |
25-
echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT
2623
check-links:
2724
runs-on: ubuntu-latest
28-
needs: changedfiles
29-
if: |
30-
github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
31-
&& ${{needs.changedfiles.outputs.md}}
25+
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'otelbot[bot]' }}
26+
timeout-minutes: 15
3227
steps:
3328
- name: Checkout Repo
34-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
30+
31+
- name: Get changed markdown files
32+
id: changed-files
33+
uses: tj-actions/changed-files@v46
3534
with:
36-
fetch-depth: 0
35+
files: |
36+
**/*.md
3737
3838
- name: Install markdown-link-check
39+
if: steps.changed-files.outputs.any_changed == 'true'
3940
run: npm install -g markdown-link-check@v3.12.2
4041

4142
- name: Run markdown-link-check
43+
if: steps.changed-files.outputs.any_changed == 'true'
4244
run: |
4345
markdown-link-check \
4446
--verbose \
4547
--config .github/workflows/check_links_config.json \
46-
${{needs.changedfiles.outputs.md}} \
47-
|| { echo "Check that anchor links are lowercase"; exit 1; }
48+
${{ steps.changed-files.outputs.all_changed_files }} \
49+
|| { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/contrib.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ name: Core Contrib Test
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'release/*'
7-
- 'otelbot/*'
5+
branches:
6+
- 'main'
87
pull_request:
98

109
permissions:

.github/workflows/lint_0.yml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Lint 0
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:
@@ -70,6 +69,44 @@ jobs:
7069
- name: Run tests
7170
run: tox -e lint-opentelemetry-proto-gen-latest
7271

72+
lint-opentelemetry-protojson-gen-latest:
73+
name: opentelemetry-protojson-gen-latest
74+
runs-on: ubuntu-latest
75+
timeout-minutes: 30
76+
steps:
77+
- name: Checkout repo @ SHA - ${{ github.sha }}
78+
uses: actions/checkout@v4
79+
80+
- name: Set up Python 3.14
81+
uses: actions/setup-python@v5
82+
with:
83+
python-version: "3.14"
84+
85+
- name: Install tox
86+
run: pip install tox-uv
87+
88+
- name: Run tests
89+
run: tox -e lint-opentelemetry-protojson-gen-latest
90+
91+
lint-opentelemetry-codegen-json:
92+
name: opentelemetry-codegen-json
93+
runs-on: ubuntu-latest
94+
timeout-minutes: 30
95+
steps:
96+
- name: Checkout repo @ SHA - ${{ github.sha }}
97+
uses: actions/checkout@v4
98+
99+
- name: Set up Python 3.14
100+
uses: actions/setup-python@v5
101+
with:
102+
python-version: "3.14"
103+
104+
- name: Install tox
105+
run: pip install tox-uv
106+
107+
- name: Run tests
108+
run: tox -e lint-opentelemetry-codegen-json
109+
73110
lint-opentelemetry-sdk:
74111
name: opentelemetry-sdk
75112
runs-on: ubuntu-latest

.github/workflows/misc_0.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc 0
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/lint.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Lint {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/misc.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

.github/workflows/templates/test.yml.j2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ name: Test {{ file_number }}
55

66
on:
77
push:
8-
branches-ignore:
9-
- 'release/*'
10-
- 'otelbot/*'
8+
branches:
9+
- 'main'
1110
pull_request:
1211

1312
permissions:

0 commit comments

Comments
 (0)