Skip to content

Commit 5b8aafc

Browse files
authored
Merge branch 'main' into update-svrnm-affiliation-and-areas-of-interest
2 parents 7b7f1a8 + d697db9 commit 5b8aafc

Some content is hidden

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

55 files changed

+780
-320
lines changed

.cspell.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ words:
3939
- grafana
4040
- Hostmetrics
4141
- hostmetricsreceiver
42+
- Instrgen
4243
- jemmic
4344
- keptn
4445
- kubecon
@@ -67,6 +68,7 @@ words:
6768
- Sysplex
6869
- acramsay
6970
- adot
71+
- agentmanwg
7072
- alolita
7173
- amye
7274
- andré
@@ -110,6 +112,7 @@ words:
110112
- dyla
111113
- dynatrace
112114
- easycla
115+
- ebpf
113116
- eiffel
114117
- emea
115118
- endsigs
@@ -124,6 +127,7 @@ words:
124127
- heptio
125128
- hongalex
126129
- horovits
130+
- instrgen
127131
- jackjia
128132
- jaglowski
129133
- javaagent
@@ -146,6 +150,7 @@ words:
146150
- logz
147151
- lucavallin
148152
- lukas
153+
- lycheeverse
149154
- magnusbaeck
150155
- maintainership
151156
- mancuso
@@ -162,6 +167,8 @@ words:
162167
- mkorbi
163168
- molkova
164169
- msomasu
170+
- MSYS
171+
- PATHCONV
165172
- mtwo
166173
- mwear
167174
- najaryan
@@ -173,16 +180,19 @@ words:
173180
- nikimanoledaki
174181
- novotny
175182
- observiq
183+
- opamp
176184
- OpenLIT
177185
- opentelemetry
178186
- opentelemetrybot
179187
- otel
180188
- otel-agentmanwg
181189
- otel-comms
182190
- otel-ebpf
191+
- otelbot
183192
- otep
184193
- otlp
185194
- outreachy
195+
- Packagist
186196
- Prometheus
187197
- paixão
188198
- pająk
@@ -191,8 +201,10 @@ words:
191201
- proto
192202
- protos
193203
- pytest
204+
- Quesma
194205
- raesene
195206
- reiley
207+
- rolldice
196208
- ruech
197209
- runtimes
198210
- rynn
@@ -235,5 +247,6 @@ words:
235247
- triager
236248
- triagers
237249
- teamcity
250+
- uninstrumented
238251
- vtex
239252
- yahn

.github/ISSUE_TEMPLATE/gc_member_onboarding.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The new member must:
3333
2. [Concepts](https://opentelemetry.io/docs/concepts/)
3434
3. [Specification](https://opentelemetry.io/docs/specs/otel/)
3535
2. Have read and agreed to comply with the
36-
[OpenTelemetry Governance Committee Charter](https://github.com/open-telemetry/community/blob/main/governance-charter.md)
36+
[OpenTelemetry Governance Committee Charter](../../governance-charter.md)
3737
as per requirements to stand for election.
3838
3. Have an email address, Google account, and GitHub account and is willing
3939
to share those details with other GC members.

.github/repository-settings.md

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ settings](../docs/how-to-configure-new-repository.md#repository-settings).
1818
* EasyCLA
1919
* spelling-check
2020
* table-check
21+
* toc-check
2122

2223
### `**/**`
2324

.github/scripts/markdown-link-check-config.json

-51
This file was deleted.

.github/scripts/markdown-link-check-with-retry.sh

-17
This file was deleted.

.github/workflows/fossa.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: FOSSA scanning
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
fossa:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
17+
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
with:
19+
api-key: ${{secrets.FOSSA_API_KEY}}
20+
team: OpenTelemetry

.github/workflows/toc-check.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Table of contents checking
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
toc-check:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
- name: check TOC in assets.md
13+
run: make markdown-toc-check

.lychee.toml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
include_fragments = true
2+
3+
accept = ["200..=299", "401", "403"]
4+
5+
exclude = [
6+
"https://slack.com/help/articles/8328303095443-Understand-Channel-Managers-in-Slack",
7+
"https://observe2020.io",
8+
"https://servicenow.com",
9+
# excluding links to user profiles is done for performance
10+
# because there are a lot of links to user profiles in this repository
11+
# and GitHub extra throttles access to user profile pages
12+
"^https://github.com/[^/]+$"
13+
]
14+
15+
# better to be safe and avoid failures
16+
max_retries = 6

COMMUNICATION.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
## Document purpose
44

5-
OpenTelemetry has a [Code of
6-
Conduct](https://github.com/open-telemetry/community/blob/master/code-of-conduct.md)
5+
OpenTelemetry has a [Code of Conduct](./code-of-conduct.md)
76
where maintainers and community members pledge to foster a welcoming and open
87
community. The code of conduct cites examples of unacceptable behavior by
98
participants – like harassment, trolling or personal attacks – that would lead to

CONTRIBUTING.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributing
2+
3+
Welcome to OpenTelemetry community repository!
4+
5+
Before you start - see OpenTelemetry general [contributing](guides/contributor/README.md)
6+
requirements and recommendations.
7+
8+
## Updating SIG information on the README.md
9+
10+
The SIG tables on the [README.md](README.md) page are generated from [`sigs.yml`](sigs.yml).
11+
12+
To regenerate those tables after updating any `sigs.yml` content, run:
13+
14+
```bash
15+
make table-generation
16+
```
17+
18+
## Updating the assets.md page
19+
20+
The [`assets.md`](assets.md) page has an auto-generated table of contents.
21+
To regenerate the table of contents after updating any headings on that page, run:
22+
23+
```bash
24+
make markdown-toc
25+
```

Makefile

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# All documents to be used in spell check.
22
ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path './node_modules/*' | sort)
33

4+
# This is needed to make the /repo paths below work in Windows Git Bash
5+
export MSYS_NO_PATHCONV=1
6+
47
.PHONY: table-generation
58
table-generation:
69
docker run --rm -v ${PWD}:/repo -w /repo python:3-alpine python ./scripts/update-sig-tables.py --install;
710

8-
911
validate-sigs:
1012
docker run --rm -v ${PWD}:/repo -w /repo python:3-alpine python ./scripts/validate-sigs.py --install;
1113

@@ -14,13 +16,13 @@ table-check:
1416

1517
.PHONY: markdown-link-check
1618
markdown-link-check:
17-
@if ! npm ls markdown-link-check; then npm install; fi
18-
find . -type f \
19-
-name '*.md' \
20-
-not -path './node_modules/*' \
21-
-not -path './elections/*/governance-committee-election.md' \
22-
-not -path './elections/*/governance-committee-candidates.md' \
23-
| xargs .github/scripts/markdown-link-check-with-retry.sh
19+
docker run --rm \
20+
--mount 'type=bind,source=$(PWD),target=/home/repo' \
21+
lycheeverse/lychee \
22+
--config home/repo/.lychee.toml \
23+
--root-dir /home/repo \
24+
--verbose \
25+
home/repo
2426

2527
# This target runs markdown-toc on all files that contain
2628
# a pair of comments <!-- toc --> and <!-- tocstop -->.
@@ -35,3 +37,6 @@ markdown-toc:
3537
echo markdown-toc: no TOC markers, skipping $$f; \
3638
fi; \
3739
done
40+
41+
markdown-toc-check: markdown-toc
42+
git diff --exit-code ':*.md' || (echo 'Generated markdown Table of Contents is out of date, please run "make markdown-toc" and commit the changes in this PR.' && exit 1)

0 commit comments

Comments
 (0)