Skip to content

Commit cad6dfe

Browse files
Merge branch 'main' into ap/stabilityOtep
2 parents 5763b40 + 5712620 commit cad6dfe

95 files changed

Lines changed: 1433 additions & 1012 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.

.cspell.yaml

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# For settings, see
2+
# https://www.streetsidesoftware.com/vscode-spell-checker/docs/configuration/
3+
version: '0.2'
4+
language: en-US
5+
caseSensitive: true
6+
allowCompoundWords: true
7+
useGitignore: true
8+
import:
9+
- https://cdn.jsdelivr.net/npm/@cspell/dict-people-names/cspell-ext.json
10+
ignorePaths:
11+
- '**/*.svg'
12+
- '.*.yml'
13+
- '.*.yaml'
14+
- 'schemas/**'
15+
- 'spec-compliance-matrix/*.yaml'
16+
- 'oteps/assets/0225*.*'
17+
patterns:
18+
- name: CodeBlock
19+
pattern: |
20+
/
21+
^(\s*[~`]{3,}) # Matches 3 or more backticks or tildes to start a code block.
22+
.* # all languages and options, e.g. shell {hl_lines=[12]}
23+
[\s\S]*? # content
24+
\1 # Matches the same symbol which started the match.
25+
/igmx
26+
- name: CodeName
27+
pattern: |
28+
/
29+
([~`]) # Matches a single backtick or tilde to start a code block.
30+
[^~`]*? # Matches any characters except backticks or tildes, non-greedy.
31+
\1 # Matches the same symbol which started the match.
32+
/x
33+
- name: Links
34+
pattern: |
35+
/
36+
\[[^\]]+\] # Matches the link text inside square brackets [ ... ].
37+
\( # Match the opening parentheses for the URL.
38+
[^)]+ # Matches any URL/path until the closing ) — works for both relative and absolute.
39+
\) # Match the closing parentheses for the URL.
40+
/x
41+
- name: Redirect
42+
pattern: |
43+
/
44+
redirect:.+$ # Matches any front-matter redirect line.
45+
/mx
46+
languageSettings:
47+
- languageId:
48+
- markdown
49+
- yaml
50+
ignoreRegExpList:
51+
- CodeBlock
52+
- CodeName
53+
- Links
54+
- Redirect
55+
dictionaries:
56+
# Local word lists
57+
- en-words
58+
# Programming languages and software terms
59+
- cpp
60+
- csharp
61+
- dart
62+
- django
63+
- docker
64+
- dotnet
65+
- elixir
66+
- flutter
67+
- fsharp
68+
- golang
69+
- haskell
70+
- html
71+
- java
72+
- julia
73+
- k8s
74+
- kotlin
75+
- markdown
76+
- node
77+
- npm
78+
- php
79+
- python
80+
- ruby
81+
- rust
82+
- scala
83+
- softwareTerms
84+
- swift
85+
- typescript
86+
# Other
87+
- companies
88+
- aws
89+
- google
90+
- people-names
91+
words:
92+
- BLRP
93+
- Kubecon
94+
- OpAMP
95+
- OTCA
96+
- OTEP
97+
- OTTL
98+
- cumulatives
99+
- deser
100+
- inclusivity
101+
- oteps
102+
- representivity
103+
- relatedly
104+
- Naur
105+
- configurator
106+
- relitigating
107+
- IDCONTEXT
108+
- pdata
109+
- Dpanic

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ For non-trivial changes, follow the [change proposal process](https://github.com
1010
* [ ] Related [OTEP(s)](https://github.com/open-telemetry/oteps) #
1111
* [ ] Links to the prototypes (when adding or changing features)
1212
* [ ] [`CHANGELOG.md`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/CHANGELOG.md) file updated for non-trivial changes
13+
* For trivial changes, include `[chore]` in the PR title to skip the changelog check
1314
* [ ] [Spec compliance matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix/template.yaml) updated if necessary

.github/scripts/triage-helper/Pipfile.lock

Lines changed: 92 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/checks.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: check out code
18-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919

2020
- name: install dependencies
2121
run: npm install
@@ -27,9 +27,9 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: check out code
30-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131

32-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
32+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3333

3434
- name: install yamllint
3535
run: make install-yamllint
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: check out code
44-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4545

4646
- name: install dependencies
4747
run: npm install
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- name: check out code
59-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
59+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6060

6161
- name: install dependencies
6262
run: npm install
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- name: check out code
74-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
74+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7575

7676
- name: run compliance-matrix
7777
run: make compliance-matrix
@@ -83,7 +83,11 @@ jobs:
8383
runs-on: ubuntu-latest
8484
steps:
8585
- name: check out code
86-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
87-
88-
- name: run misspell
89-
run: make misspell
86+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
87+
88+
- uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28 # v8.3.0
89+
with:
90+
incremental_files_only: false # check all files, not just changed files
91+
config: .cspell.yaml
92+
suggestions: true
93+
treat_flagged_words_as_errors: true

.github/workflows/fossa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
fossa:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616

17-
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
17+
- uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

.github/workflows/ossf-scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Needed for GitHub OIDC token if publish_results is true
2020
id-token: write
2121
steps:
22-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
persist-credentials: false
2525

@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
36+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
45+
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
4646
with:
4747
sarif_file: results.sarif

.github/workflows/stale-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write # required for marking and closing stale PRs
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
15+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-pr-message: 'This PR was marked stale. It will be closed in 14 days without additional activity.'

.github/workflows/triage-followup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
run:
1818
working-directory: ./.github/scripts/triage-helper
1919
steps:
20-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21-
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
21+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2222
with:
2323
python-version: 3.14
2424
- name: Install pipenv

.github/workflows/verify-changelog.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name: Verify CHANGELOG
77

88
on:
99
pull_request:
10-
types: [opened, synchronize, reopened, labeled, unlabeled]
10+
types: [opened, synchronize, reopened, labeled, unlabeled, edited]
1111
branches:
1212
- main
1313

@@ -20,15 +20,16 @@ jobs:
2020
# Skip if:
2121
# - PR has "Skip Changelog" label
2222
# - PR has "dependencies" label
23-
# - PR title contains "[chore]"
23+
# - PR title contains "[chore]" or starts with "chore:"
2424
if: >
2525
! contains(github.event.pull_request.labels.*.name, 'Skip Changelog') &&
2626
! contains(github.event.pull_request.labels.*.name, 'dependencies') &&
27-
! contains(github.event.pull_request.title, '[chore]')
27+
! contains(github.event.pull_request.title, '[chore]') &&
28+
! startsWith(github.event.pull_request.title, 'chore:')
2829
2930
steps:
3031
- name: Checkout repository
31-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3233
with:
3334
fetch-depth: 0
3435

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ bin
2222
# Vim
2323
.swp
2424

25-
# Misspell binary
26-
internal/tools/bin
27-
2825
# Node.js files for tools (e.g. markdown-toc)
2926
node_modules/
3027
package-lock.json

0 commit comments

Comments
 (0)