Skip to content

Commit 796a6ba

Browse files
authored
Merge branch 'main' into pdata-json-int
2 parents 7efc2fa + c62353b commit 796a6ba

50 files changed

Lines changed: 496 additions & 337 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Allow underscores in feature gate IDs for compatibility with component names with underscores
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [15592]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Migrate `TimeoutConfig` to schema-based configuration generated by mdatagen.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [15505]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

.github/workflows/add-labels-and-owners.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
add-labels-and-owners:
1313
permissions:
1414
pull-requests: write
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-slim
1616
if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'renovate[bot]' && github.repository_owner == 'open-telemetry' && github.event.pull_request.draft == false }}
1717
steps:
1818
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/add-labels-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
issues: write
1313

14-
runs-on: ubuntu-24.04
14+
runs-on: ubuntu-slim
1515
steps:
1616
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1717
with:

.github/workflows/add-rfc-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
add-rfc-label:
1515
permissions:
1616
pull-requests: write
17-
runs-on: ubuntu-24.04
17+
runs-on: ubuntu-slim
1818
if: >-
1919
${{ github.repository_owner == 'open-telemetry'
2020
&& github.event.pull_request.draft == false

.github/workflows/approve-workflows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
actions: write
1414
contents: read
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-slim
1616
steps:
1717
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1818
with:

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
key: go-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.sum') }}
6565
lookup-only: true
6666
- name: golint
67-
run: make -j2 golint
67+
run: make -j4 golint
6868
- name: goimpi
6969
run: make goimpi
7070

.github/workflows/check-links.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
changedfiles:
1818
name: changed files
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-slim
2020
env:
2121
PR_HEAD: ${{ github.event.pull_request.head.sha }}
2222
outputs:
@@ -38,7 +38,7 @@ jobs:
3838
3939
echo "files=$files" >> $GITHUB_OUTPUT
4040
check-links:
41-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-slim
4242
needs: changedfiles
4343
if: ${{needs.changedfiles.outputs.files}}
4444
steps:

.github/workflows/check-merge-freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
if: |
2626
(!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) ||
2727
((github.event.pull_request.user.login || github.event.merge_group.head_commit.author.name) != 'otelbot[bot]')
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-slim
2929
steps:
3030
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131
with:

.github/workflows/check-pr-issue-link.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions: read-all
1414

1515
jobs:
1616
check-pr-issue-link:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-slim
1818
if: >-
1919
${{ github.repository_owner == 'open-telemetry'
2020
&& github.event.pull_request.user.type != 'Bot'

0 commit comments

Comments
 (0)