Skip to content

Commit c5ae52e

Browse files
authored
Merge branch 'main' into feat/grpc_resolver_scheme
2 parents fbe34b7 + 76ede07 commit c5ae52e

266 files changed

Lines changed: 2238 additions & 2006 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.

.chloggen/aix_tier3.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.chloggen/alpha-profiles.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.chloggen/fix-mdatagen-entity-builder.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.chloggen/go_validators_mdatagen.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.chloggen/mdatagen-add-attribute-semconv-refs.yaml renamed to .chloggen/mdatagen-toversion-only-stable-deprecated.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@ change_type: enhancement
77
component: cmd/mdatagen
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add semconv reference for attributes
10+
note: Only allow the `ToVersion` feature flag attribute to be set for the `Stable` and `Deprecated` stages.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [13297]
13+
issues: [15040]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
18-
subtext:
18+
subtext: |
19+
To better match the feature flag README
20+
(https://github.com/open-telemetry/opentelemetry-collector/blob/main/featuregate/README.md#feature-lifecycle).
1921
2022
# Optional: The change log or logs in which this entry should be included.
2123
# e.g. '[user]' or '[user, api]'
2224
# Include 'user' if the change is relevant to end users.
2325
# Include 'api' if there is a change to a library API.
2426
# Default: '[user]'
25-
change_logs: [user]
27+
change_logs: []

.chloggen/mdatagen_fix_reporoot.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.chloggen/remove-resource-constant-labels.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/api-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
path: ${{ github.head_ref }}
3232

3333
- name: Setup Go
34-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
34+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3535
with:
3636
go-version: oldstable
3737
cache: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
32-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
32+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3333
with:
3434
go-version: oldstable
3535
cache: false

.github/workflows/build-and-test-windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Checkout Repo
2626
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
- name: Setup Go
28-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
28+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2929
with:
3030
go-version: oldstable
3131
cache: false
@@ -54,7 +54,7 @@ jobs:
5454
- name: Checkout Repo
5555
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5656
- name: Setup Go
57-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
57+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5858
with:
5959
go-version: oldstable
6060
cache: false

0 commit comments

Comments
 (0)