Skip to content

Commit e36da81

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collector into 14311
2 parents f29a1c2 + ff135af commit e36da81

File tree

255 files changed

+2602
-2721
lines changed

Some content is hidden

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

255 files changed

+2602
-2721
lines changed
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: pkg/service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated `telemetry.disableHighCardinalityMetrics` feature gate.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14373]
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: [user]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: all
7+
component: pkg/service
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Update semconv import to 1.38.0
10+
note: Remove deprecated `service.noopTracerProvider` feature gate.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [14305]
13+
issues: [14374]
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.
@@ -22,4 +22,4 @@ subtext:
2222
# Include 'user' if the change is relevant to end users.
2323
# Include 'api' if there is a change to a library API.
2424
# Default: '[user]'
25-
change_logs: []
25+
change_logs: [user]
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: pkg/xconnector
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add component ID type validation to all xconnector Create methods
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14357]
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/builder-snapshot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
3838

39-
- uses: anchore/sbom-action/download-syft@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
39+
- uses: anchore/sbom-action/download-syft@a930d0ac434e3182448fe678398ba5713717112a # v0.21.0
4040

4141
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
4242
with:

.github/workflows/go-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
~/go/pkg/mod
3030
key: go-cache-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('**/go.sum') }}
3131
- name: Run the benchmarks
32-
uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
32+
uses: CodSpeedHQ/action@dbda7111f8ac363564b0c51b992d4ce76bb89f2f # v4.5.2
3333
with:
3434
mode: walltime
3535
run: make for-all-target TARGET="timebenchmark"

.github/workflows/spell-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1717

1818
- name: Run cSpell
19-
uses: streetsidesoftware/cspell-action@e5a858a18b7e0b56e0342b1dcad796308b7341a2 # v8.1.1
19+
uses: streetsidesoftware/cspell-action@24fa8d3096a314ce263f39578744e9d9f8d80acf # v8.1.2
2020
with:
2121
incremental_files_only: false
2222
use_cspell_files: true

.github/workflows/stale-pr.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ permissions: read-all
77

88
jobs:
99
stale:
10-
if: ${{ false }} # Stale action paused for the holidays
1110
permissions:
1211
issues: write # for actions/stale to close stale issues
1312
pull-requests: write # for actions/stale to close stale PRs

.github/workflows/tidy-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
contents: write # for Git to git push
1414
timeout-minutes: 30
1515
runs-on: ubuntu-latest
16-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency-major-update') && (github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot')) }}
16+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependency-major-update') && (github.actor == 'renovate[bot]' || contains(github.event.pull_request.labels.*.name, 'renovatebot')) && github.event.pull_request.head.repo.fork == false }}
1717
steps:
1818
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1919
with:

CHANGELOG-API.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG
77

88
<!-- next version -->
99

10+
## v1.49.0/v0.143.0
11+
12+
### 🛑 Breaking changes 🛑
13+
14+
- `pkg/xprocessor`: Use pointer receivers in xprocessor factory methods for consistency with other factories. (#14348)
15+
16+
<!-- previous-version -->
17+
1018
## v1.48.0/v0.142.0
1119

1220
### 🛑 Breaking changes 🛑

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./
77

88
<!-- next version -->
99

10+
## v1.49.0/v0.143.0
11+
12+
### 💡 Enhancements 💡
13+
14+
- `all`: Update semconv import to 1.38.0 (#14305)
15+
- `exporter/nop`: Add profiles support to nop exporter (#14331)
16+
- `pkg/pdata`: Optimize the size and pointer bytes for pdata structs (#14339)
17+
- `pkg/pdata`: Avoid using interfaces/oneof like style for optional fields (#14333)
18+
19+
<!-- previous-version -->
20+
1021
## v1.48.0/v0.142.0
1122

1223
### 💡 Enhancements 💡

0 commit comments

Comments
 (0)