Skip to content

Commit 9f56cf0

Browse files
Update references to newly-deprecated exporterhelper.Timeout/QueueSettings (#35158)
**Description:** `TimeoutSettings` and `QueueSettings` in the `exporterhelper` core collector package were renamed to `TimeoutConfig` and `QueueConfig` for naming consistency reasons, and the related `NewDefault` functions were renamed as well. This PR updates the core libraries to a prerelease version with those changes, and updates opentelemetry-collector-contrib modules to the new names, to plan for the deprecation of the old names in v0.110.0. **Link to tracking Issue:** Related to [this PR](open-telemetry/opentelemetry-collector#11132) and [this issue](open-telemetry/opentelemetry-collector#6767) on the core collector. **Notes:** - `go.opentelemetry.io/collector/cmd/mdatagen` is specifically *not* updated, as it currently has a bug causing a CI test failure. - The `prometheus-compliance-tests` CI failure is unrelated to this PR.
1 parent 33ce26b commit 9f56cf0

File tree

660 files changed

+19778
-20048
lines changed

Some content is hidden

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

660 files changed

+19778
-20048
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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: all
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: TimeoutSettings/QueueSettings fields in various Config structs are no longer embedded
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: [35158]
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+
Structs in which .TimeoutSettings is no longer embedded:
20+
* carbonexporter.Config
21+
* googlecloudpubsubreceiver.Config
22+
Structs in which .TimeoutSettings and .QueueSettings are no longer embedded:
23+
* alertmanagerexporter.Config
24+
* googlecloudexporter.Config
25+
* googlemanagedprometheusexporter.Config
26+
* otelarrowexporter.Config
27+
28+
# If your change doesn't affect end users or the exported elements of any package,
29+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
30+
# Optional: The change log or logs in which this entry should be included.
31+
# e.g. '[user]' or '[user, api]'
32+
# Include 'user' if the change is relevant to end users.
33+
# Include 'api' if there is a change to a library API.
34+
# Default: '[user]'
35+
change_logs: [api]

cmd/githubgen/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.22.0
44

55
require (
66
github.com/google/go-github/v64 v64.0.0
7-
go.opentelemetry.io/collector/confmap v1.15.0
8-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
7+
go.opentelemetry.io/collector/confmap v1.15.1-0.20240911162712-6c2697c4453c
8+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
99
gopkg.in/yaml.v3 v3.0.1
1010
)
1111

cmd/githubgen/go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/opampsupervisor/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ require (
1212
github.com/knadh/koanf/v2 v2.1.1
1313
github.com/open-telemetry/opamp-go v0.15.0
1414
github.com/stretchr/testify v1.9.0
15-
go.opentelemetry.io/collector/config/configopaque v1.15.0
16-
go.opentelemetry.io/collector/config/configtls v1.15.0
17-
go.opentelemetry.io/collector/semconv v0.109.0
15+
go.opentelemetry.io/collector/config/configopaque v1.15.1-0.20240911162712-6c2697c4453c
16+
go.opentelemetry.io/collector/config/configtls v1.15.1-0.20240911162712-6c2697c4453c
17+
go.opentelemetry.io/collector/semconv v0.109.1-0.20240911162712-6c2697c4453c
1818
go.uber.org/goleak v1.3.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/sys v0.25.0

cmd/opampsupervisor/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/builder-config.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dist:
1414
otelcol_version: 0.109.0
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.0
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240911162712-6c2697c4453c
1818
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.109.0
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.109.0
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.109.0
@@ -50,10 +50,10 @@ extensions:
5050
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.109.0
5151

5252
exporters:
53-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.0
54-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.0
55-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0
56-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0
53+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240911162712-6c2697c4453c
54+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.1-0.20240911162712-6c2697c4453c
55+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240911162712-6c2697c4453c
56+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240911162712-6c2697c4453c
5757
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.109.0
5858
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.109.0
5959
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.109.0
@@ -100,8 +100,8 @@ exporters:
100100
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.109.0
101101

102102
processors:
103-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.0
104-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0
103+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240911162712-6c2697c4453c
104+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240911162712-6c2697c4453c
105105
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.109.0
106106
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.109.0
107107
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.109.0
@@ -127,8 +127,8 @@ processors:
127127
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.109.0
128128

129129
receivers:
130-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.0
131-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0
130+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.1-0.20240911162712-6c2697c4453c
131+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240911162712-6c2697c4453c
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.109.0
133133
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.109.0
134134
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.109.0
@@ -220,7 +220,7 @@ receivers:
220220
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.109.0
221221

222222
connectors:
223-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.0
223+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.20240911162712-6c2697c4453c
224224
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.109.0
225225
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.109.0
226226
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.109.0
@@ -233,11 +233,11 @@ connectors:
233233
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.109.0
234234

235235
providers:
236-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0
237-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
238-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0
239-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0
240-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0
236+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.1-0.20240911162712-6c2697c4453c
237+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
238+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.1-0.20240911162712-6c2697c4453c
239+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.1-0.20240911162712-6c2697c4453c
240+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240911162712-6c2697c4453c
241241
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.109.0
242242
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.109.0
243243

cmd/otelcontribcol/components.go

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)