Skip to content

Commit 8bd1571

Browse files
sv-splunksv-splunk
committed
merge from upstream
2 parents 72ecc74 + 47c712a commit 8bd1571

File tree

651 files changed

+21231
-20731
lines changed

Some content is hidden

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

651 files changed

+21231
-20731
lines changed

‎.chloggen/b_fix-consumer-lost-consume-race-on-wg.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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. filelogreceiver)
7+
component: kafkareceiver (franz-go client)
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix race on lost partition
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [41239]
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+
When using the franz-go client, fixes an edge case where a consumer could
20+
lose a partition while it is consuming messages. This leads to unexpected
21+
behavior due to the race and likely cause the consumer to malfunction.
22+
23+
# If your change doesn't affect end users or the exported elements of any package,
24+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
25+
# Optional: The change log or logs in which this entry should be included.
26+
# e.g. '[user]' or '[user, api]'
27+
# Include 'user' if the change is relevant to end users.
28+
# Include 'api' if there is a change to a library API.
29+
# Default: '[user]'
30+
change_logs: [user]

‎.chloggen/elasticsearchexporter-update-batcher-cfg-api.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: breaking
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
5+
component: elasticsearchexporter
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Update 'batcher' config to use internal struct instead of the one removed from the core.
9+
10+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
11+
issues: [41225]
12+
13+
# If your change doesn't affect end users or the exported elements of any package,
14+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
15+
# Optional: The change log or logs in which this entry should be included.
16+
# e.g. '[user]' or '[user, api]'
17+
# Include 'user' if the change is relevant to end users.
18+
# Include 'api' if there is a change to a library API.
19+
# Default: '[user]'
20+
change_logs: [api]

‎.chloggen/elliot_add-level-to-faro-logs.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: faroreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Ensure that the level is added to all the faro logs.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [40701]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎.chloggen/mysql-fsync-ops.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: mysqlreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Collect 'fsync' log operations.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [41175]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎.chloggen/postgres-client-pool-fg-alpha.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: receiver/postgresql
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Move receiver.postgresql.connectionPool feature gate to alpha
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [30831]
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: This change updates the receiver to use the connection pooling for performance benefits.
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎.github/auto_assign.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ assigneeGroups:
1313
# Approvers
1414
- ArthurSens
1515
- braydonk
16-
- ChrsMark
16+
# - ChrsMark (On leave, back August 25th)
1717
# - crobert-1 (On leave, back August 5th)
1818
- dashpole
1919
- dehaansa

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ For more information about the maintainer role, see the [community repository](h
8686

8787
- [Arthur Silva Sens](https://github.com/ArthurSens), Grafana Labs
8888
- [Braydon Kains](https://github.com/braydonk), Google
89-
- [Christos Markou](https://github.com/ChrsMark), Elastic
89+
- [Christos Markou](https://github.com/ChrsMark), Elastic (On leave)
9090
- [Curtis Robert](https://github.com/crobert-1), Splunk
9191
- [David Ashpole](https://github.com/dashpole), Google
9292
- [Edmo Vamerlatti Costa](https://github.com/edmocosta), Elastic

‎cmd/golden/go.mod‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.129.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.129.0
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.35.1-0.20250708151327-74cb2f311035
10-
go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250708151327-74cb2f311035
11-
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035
12-
go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
13-
go.opentelemetry.io/collector/consumer v1.35.1-0.20250708151327-74cb2f311035
14-
go.opentelemetry.io/collector/pdata v1.35.1-0.20250708151327-74cb2f311035
15-
go.opentelemetry.io/collector/receiver v1.35.1-0.20250708151327-74cb2f311035
16-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.129.1-0.20250708151327-74cb2f311035
9+
go.opentelemetry.io/collector/component v1.35.1-0.20250710172626-1ebb9b20cfa5
10+
go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250710172626-1ebb9b20cfa5
11+
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250710172626-1ebb9b20cfa5
12+
go.opentelemetry.io/collector/confmap v1.35.1-0.20250710172626-1ebb9b20cfa5
13+
go.opentelemetry.io/collector/consumer v1.35.1-0.20250710172626-1ebb9b20cfa5
14+
go.opentelemetry.io/collector/pdata v1.35.1-0.20250710172626-1ebb9b20cfa5
15+
go.opentelemetry.io/collector/receiver v1.35.1-0.20250710172626-1ebb9b20cfa5
16+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.129.1-0.20250710172626-1ebb9b20cfa5
1717
go.opentelemetry.io/otel/metric v1.37.0
1818
go.opentelemetry.io/otel/trace v1.37.0
1919
go.uber.org/goleak v1.3.0
@@ -50,28 +50,28 @@ require (
5050
github.com/pmezard/go-difflib v1.0.0 // indirect
5151
github.com/rs/cors v1.11.1 // indirect
5252
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
53-
go.opentelemetry.io/collector v0.129.1-0.20250708151327-74cb2f311035 // indirect
54-
go.opentelemetry.io/collector/client v1.35.1-0.20250708151327-74cb2f311035 // indirect
55-
go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250708151327-74cb2f311035 // indirect
56-
go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250708151327-74cb2f311035 // indirect
57-
go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035 // indirect
58-
go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035 // indirect
59-
go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250708151327-74cb2f311035 // indirect
60-
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
61-
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
62-
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect
63-
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect
64-
go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
65-
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
66-
go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250708151327-74cb2f311035 // indirect
67-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
68-
go.opentelemetry.io/collector/featuregate v1.35.1-0.20250708151327-74cb2f311035 // indirect
69-
go.opentelemetry.io/collector/internal/sharedcomponent v0.129.1-0.20250708151327-74cb2f311035 // indirect
70-
go.opentelemetry.io/collector/internal/telemetry v0.129.1-0.20250708151327-74cb2f311035 // indirect
71-
go.opentelemetry.io/collector/pdata/pprofile v0.129.1-0.20250708151327-74cb2f311035 // indirect
72-
go.opentelemetry.io/collector/pipeline v0.129.1-0.20250708151327-74cb2f311035 // indirect
73-
go.opentelemetry.io/collector/receiver/receiverhelper v0.129.1-0.20250708151327-74cb2f311035 // indirect
74-
go.opentelemetry.io/collector/receiver/xreceiver v0.129.1-0.20250708151327-74cb2f311035 // indirect
53+
go.opentelemetry.io/collector v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
54+
go.opentelemetry.io/collector/client v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
55+
go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
56+
go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
57+
go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
58+
go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
59+
go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
60+
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
61+
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
62+
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
63+
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
64+
go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
65+
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
66+
go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
67+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
68+
go.opentelemetry.io/collector/featuregate v1.35.1-0.20250710172626-1ebb9b20cfa5 // indirect
69+
go.opentelemetry.io/collector/internal/sharedcomponent v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
70+
go.opentelemetry.io/collector/internal/telemetry v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
71+
go.opentelemetry.io/collector/pdata/pprofile v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
72+
go.opentelemetry.io/collector/pipeline v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
73+
go.opentelemetry.io/collector/receiver/receiverhelper v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
74+
go.opentelemetry.io/collector/receiver/xreceiver v0.129.1-0.20250710172626-1ebb9b20cfa5 // indirect
7575
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
7676
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
7777
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect

0 commit comments

Comments
 (0)