Skip to content

Commit 5c369fc

Browse files
authored
Merge branch 'open-telemetry:main' into feat/mdatagen-featuregates-docs
2 parents f92d1f8 + 6fb786c commit 5c369fc

File tree

49 files changed

+397
-94
lines changed

Some content is hidden

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

49 files changed

+397
-94
lines changed

.chloggen/14140.yaml

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. otlpreceiver)
7+
component: all
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Ensure service service.instance.id is the same for all the signals when it is autogenerated.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14140]
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. otlpreceiver)
7+
component: connector/forward
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add support for Profiles to Profiles
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14092]
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. otlpreceiver)
7+
component: pkg/otelcol
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: This feature has been improved and tested; secure-by-default redacts configopaque values
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12369]
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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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. otlpreceiver)
7+
component: exporter/debug
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Disable sending queue by default
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14138]
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+
The recently added sending queue configuration in Debug exporter was enabled by default and had a problematic default size of 1.
20+
This change disables the sending queue by default.
21+
Users can enable and configure the sending queue if needed.
22+
23+
# Optional: The change log or logs in which this entry should be included.
24+
# e.g. '[user]' or '[user, api]'
25+
# Include 'user' if the change is relevant to end users.
26+
# Include 'api' if there is a change to a library API.
27+
# Default: '[user]'
28+
change_logs: []

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1717

1818
- name: Run cSpell
19-
uses: streetsidesoftware/cspell-action@76c6f6d52abd57f4bcab5f3fde1bbd4f19a99eb0 # v7.2.1
19+
uses: streetsidesoftware/cspell-action@3294df585d3d639e30f3bc019cb11940b9866e95 # v8.0.0
2020
with:
2121
incremental_files_only: false
2222
use_cspell_files: true

cmd/otelcorecol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
4949
github.com/gobwas/glob v0.2.3 // indirect
5050
github.com/golang/snappy v1.0.0 // indirect
51-
github.com/google/go-tpm v0.9.6 // indirect
51+
github.com/google/go-tpm v0.9.7 // indirect
5252
github.com/google/uuid v1.6.0 // indirect
5353
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5454
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect

cmd/otelcorecol/go.sum

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

config/configgrpc/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3838
github.com/gobwas/glob v0.2.3 // indirect
3939
github.com/golang/snappy v0.0.4 // indirect
40-
github.com/google/go-tpm v0.9.6 // indirect
40+
github.com/google/go-tpm v0.9.7 // indirect
4141
github.com/google/uuid v1.6.0 // indirect
4242
github.com/hashicorp/go-version v1.7.0 // indirect
4343
github.com/json-iterator/go v1.1.12 // indirect

config/configgrpc/go.sum

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

config/confighttp/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
4141
github.com/gobwas/glob v0.2.3 // indirect
42-
github.com/google/go-tpm v0.9.6 // indirect
42+
github.com/google/go-tpm v0.9.7 // indirect
4343
github.com/google/uuid v1.6.0 // indirect
4444
github.com/hashicorp/go-version v1.7.0 // indirect
4545
github.com/json-iterator/go v1.1.12 // indirect

0 commit comments

Comments
 (0)