Skip to content

Commit 489ea3a

Browse files
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents 9e62f15 + c19392a commit 489ea3a

File tree

378 files changed

+1964
-1190
lines changed

Some content is hidden

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

378 files changed

+1964
-1190
lines changed

.chloggen/39270-sqlquery-pool.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
change_type: bug_fix
2+
component: sqlqueryreceiver
3+
issues: [39270]
4+
change_logs: [user]
5+
6+
note: respect `max_open_conn` configuration for multiple queries
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: pkg
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Improve performance of azure logs translator.
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: [39340]
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: []
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: awscloudwatchlogsexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add dynamic log_group_name and log_group_stream naming, based on awsemfexporter
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: [31382]
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/elasticsearch-lru.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: elasticsearchexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce LRU cache for profiles
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: [38606]
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]
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: sqlserverreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "`host.name`, `sqlserver.computer.name`, and `sqlserver.instance.name` are now resource attributes instead of log attributes. We used to report `computer_name` and `instance_name` in the log attributes for top query collection and they are now deprecated. Now we report the three resources attributes in both top query collection and sample query collection."
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: [39449]
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 is only relevant for logs.
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/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pkg/stanza/ @open-telemetry
166166
pkg/stanza/fileconsumer/ @open-telemetry/collector-contrib-approvers @djaglowski @andrzej-stencel
167167
pkg/status/ @open-telemetry/collector-contrib-approvers @mwear
168168
pkg/translator/azure/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @atoulme @cparkins
169-
pkg/translator/azurelogs/ @open-telemetry/collector-contrib-approvers @atoulme @cparkins @MikeGoldsmith
169+
pkg/translator/azurelogs/ @open-telemetry/collector-contrib-approvers @atoulme @cparkins @MikeGoldsmith @constanca-m
170170
pkg/translator/faro/ @open-telemetry/collector-contrib-approvers @mar4uk @rlankfo
171171
pkg/translator/jaeger/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @frzifus
172172
pkg/translator/loki/ @open-telemetry/collector-contrib-approvers @gouthamve @mar4uk

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,8 @@ jobs:
660660
runs-on: ubuntu-24.04
661661
needs: [lint, unittest, integration-tests]
662662
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
663+
permissions:
664+
contents: write
663665
steps:
664666
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
665667
- name: Set Release Tag

cmd/telemetrygen/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ require (
4444
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
4545
go.opentelemetry.io/otel/metric v1.35.0 // indirect
4646
go.uber.org/multierr v1.11.0 // indirect
47-
golang.org/x/net v0.37.0 // indirect
47+
golang.org/x/net v0.38.0 // indirect
4848
golang.org/x/sys v0.31.0 // indirect
4949
golang.org/x/text v0.23.0 // indirect
5050
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect

cmd/telemetrygen/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.

connector/exceptionsconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
6060
go.opentelemetry.io/otel/trace v1.35.0 // indirect
6161
go.uber.org/multierr v1.11.0 // indirect
62-
golang.org/x/net v0.37.0 // indirect
62+
golang.org/x/net v0.38.0 // indirect
6363
golang.org/x/sys v0.31.0 // indirect
6464
golang.org/x/text v0.24.0 // indirect
6565
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/exceptionsconnector/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.

connector/failoverconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
5252
go.opentelemetry.io/otel/trace v1.35.0 // indirect
5353
go.uber.org/multierr v1.11.0 // indirect
54-
golang.org/x/net v0.37.0 // indirect
54+
golang.org/x/net v0.38.0 // indirect
5555
golang.org/x/sys v0.31.0 // indirect
5656
golang.org/x/text v0.23.0 // indirect
5757
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/failoverconnector/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.

connector/grafanacloudconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
go.opentelemetry.io/otel/log v0.11.0 // indirect
5555
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
5656
go.uber.org/multierr v1.11.0 // indirect
57-
golang.org/x/net v0.37.0 // indirect
57+
golang.org/x/net v0.38.0 // indirect
5858
golang.org/x/sys v0.31.0 // indirect
5959
golang.org/x/text v0.23.0 // indirect
6060
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/grafanacloudconnector/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.

connector/otlpjsonconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
5555
go.opentelemetry.io/otel/trace v1.35.0 // indirect
5656
go.uber.org/multierr v1.11.0 // indirect
57-
golang.org/x/net v0.37.0 // indirect
57+
golang.org/x/net v0.38.0 // indirect
5858
golang.org/x/sys v0.31.0 // indirect
5959
golang.org/x/text v0.23.0 // indirect
6060
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/otlpjsonconnector/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.

connector/roundrobinconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
go.opentelemetry.io/otel/trace v1.35.0 // indirect
5151
go.uber.org/multierr v1.11.0 // indirect
5252
go.uber.org/zap v1.27.0 // indirect
53-
golang.org/x/net v0.37.0 // indirect
53+
golang.org/x/net v0.38.0 // indirect
5454
golang.org/x/sys v0.31.0 // indirect
5555
golang.org/x/text v0.23.0 // indirect
5656
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/roundrobinconnector/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.

connector/spanmetricsconnector/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
6161
go.opentelemetry.io/otel/trace v1.35.0 // indirect
6262
go.uber.org/multierr v1.11.0 // indirect
63-
golang.org/x/net v0.37.0 // indirect
63+
golang.org/x/net v0.38.0 // indirect
6464
golang.org/x/sys v0.31.0 // indirect
6565
golang.org/x/text v0.24.0 // indirect
6666
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

connector/spanmetricsconnector/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.

exporter/alibabacloudlogserviceexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
go.opentelemetry.io/otel/trace v1.35.0 // indirect
7171
go.uber.org/atomic v1.10.0 // indirect
7272
go.uber.org/multierr v1.11.0 // indirect
73-
golang.org/x/net v0.37.0 // indirect
73+
golang.org/x/net v0.38.0 // indirect
7474
golang.org/x/sys v0.31.0 // indirect
7575
golang.org/x/text v0.24.0 // indirect
7676
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect

exporter/alibabacloudlogserviceexporter/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.

0 commit comments

Comments
 (0)