Skip to content

Commit ce09eef

Browse files
authored
Merge branch 'main' into controller-interface
2 parents dd37e71 + 20802fb commit ce09eef

File tree

100 files changed

+809
-600
lines changed

Some content is hidden

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

100 files changed

+809
-600
lines changed

.chloggen/add_nop_profiles.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: 'enhancement'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7+
component: receiver/nop
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: add profiles signal support
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14253]
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/xexporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Reenable batching for profiles
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14313]
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: 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: 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 `service.noopTracerProvider` feature gate.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14374]
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: 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/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

cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5555
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5656
github.com/pmezard/go-difflib v1.0.0 // indirect
57-
github.com/spf13/pflag v1.0.9 // indirect
57+
github.com/spf13/pflag v1.0.10 // indirect
5858
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
5959
go.opentelemetry.io/collector/component/componentstatus v0.143.0 // indirect
6060
go.opentelemetry.io/collector/connector/xconnector v0.143.0 // indirect
@@ -72,7 +72,7 @@ require (
7272
go.uber.org/multierr v1.11.0 // indirect
7373
go.yaml.in/yaml/v3 v3.0.4 // indirect
7474
golang.org/x/sys v0.39.0 // indirect
75-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
75+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
7676
google.golang.org/grpc v1.78.0 // indirect
7777
google.golang.org/protobuf v1.36.11 // indirect
7878
)

cmd/mdatagen/go.sum

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

cmd/otelcorecol/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
github.com/davecgh/go-spew v1.1.1 // indirect
4141
github.com/ebitengine/purego v0.9.1 // indirect
4242
github.com/felixge/httpsnoop v1.0.4 // indirect
43-
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250903184740-5d135037bd4d // indirect
43+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20251226215517-609e4778396f // indirect
4444
github.com/fsnotify/fsnotify v1.9.0 // indirect
4545
github.com/go-logr/logr v1.4.3 // indirect
4646
github.com/go-logr/stdr v1.2.2 // indirect
@@ -50,16 +50,16 @@ require (
5050
github.com/golang/snappy v1.0.0 // indirect
5151
github.com/google/go-tpm v0.9.8 // indirect
5252
github.com/google/uuid v1.6.0 // indirect
53-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
54-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
53+
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
54+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
5555
github.com/hashicorp/go-version v1.8.0 // indirect
5656
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5757
github.com/json-iterator/go v1.1.12 // indirect
5858
github.com/klauspost/compress v1.18.2 // indirect
5959
github.com/knadh/koanf/maps v0.1.2 // indirect
6060
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
6161
github.com/knadh/koanf/v2 v2.3.0 // indirect
62-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
62+
github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
6363
github.com/mitchellh/copystructure v1.2.0 // indirect
6464
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6565
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -75,9 +75,9 @@ require (
7575
github.com/prometheus/otlptranslator v0.0.2 // indirect
7676
github.com/prometheus/procfs v0.17.0 // indirect
7777
github.com/rs/cors v1.11.1 // indirect
78-
github.com/shirou/gopsutil/v4 v4.25.11 // indirect
78+
github.com/shirou/gopsutil/v4 v4.25.12 // indirect
7979
github.com/spf13/cobra v1.10.2 // indirect
80-
github.com/spf13/pflag v1.0.9 // indirect
80+
github.com/spf13/pflag v1.0.10 // indirect
8181
github.com/stretchr/testify v1.11.1 // indirect
8282
github.com/tklauser/go-sysconf v0.3.16 // indirect
8383
github.com/tklauser/numcpus v0.11.0 // indirect
@@ -168,8 +168,8 @@ require (
168168
golang.org/x/net v0.48.0 // indirect
169169
golang.org/x/text v0.32.0 // indirect
170170
gonum.org/v1/gonum v0.16.0 // indirect
171-
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
172-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
171+
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
172+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
173173
google.golang.org/grpc v1.78.0 // indirect
174174
google.golang.org/protobuf v1.36.11 // indirect
175175
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)