Skip to content

Commit

Permalink
Update references to newly-deprecated exporterhelper.Timeout/QueueSet…
Browse files Browse the repository at this point in the history
…tings (#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.
  • Loading branch information
jade-guiton-dd committed Sep 13, 2024
1 parent 33ce26b commit 9f56cf0
Show file tree
Hide file tree
Showing 660 changed files with 19,778 additions and 20,048 deletions.
35 changes: 35 additions & 0 deletions .chloggen/exporterhelper-rename-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: all

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: TimeoutSettings/QueueSettings fields in various Config structs are no longer embedded

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [35158]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
Structs in which .TimeoutSettings is no longer embedded:
* carbonexporter.Config
* googlecloudpubsubreceiver.Config
Structs in which .TimeoutSettings and .QueueSettings are no longer embedded:
* alertmanagerexporter.Config
* googlecloudexporter.Config
* googlemanagedprometheusexporter.Config
* otelarrowexporter.Config
# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
4 changes: 2 additions & 2 deletions cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/google/go-github/v64 v64.0.0
go.opentelemetry.io/collector/confmap v1.15.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
go.opentelemetry.io/collector/confmap v1.15.1-0.20240911162712-6c2697c4453c
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
gopkg.in/yaml.v3 v3.0.1
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/githubgen/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/knadh/koanf/v2 v2.1.1
github.com/open-telemetry/opamp-go v0.15.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/config/configopaque v1.15.0
go.opentelemetry.io/collector/config/configtls v1.15.0
go.opentelemetry.io/collector/semconv v0.109.0
go.opentelemetry.io/collector/config/configopaque v1.15.1-0.20240911162712-6c2697c4453c
go.opentelemetry.io/collector/config/configtls v1.15.1-0.20240911162712-6c2697c4453c
go.opentelemetry.io/collector/semconv v0.109.1-0.20240911162712-6c2697c4453c
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/sys v0.25.0
Expand Down
12 changes: 6 additions & 6 deletions cmd/opampsupervisor/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dist:
otelcol_version: 0.109.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.109.0
Expand Down Expand Up @@ -50,10 +50,10 @@ extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.109.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.109.0
Expand Down Expand Up @@ -100,8 +100,8 @@ exporters:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.109.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.109.0
Expand All @@ -127,8 +127,8 @@ processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.109.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.109.0
Expand Down Expand Up @@ -220,7 +220,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.109.0

connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.109.0
Expand All @@ -233,11 +233,11 @@ connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.109.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.1-0.20240911162712-6c2697c4453c
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240911162712-6c2697c4453c
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.109.0

Expand Down
20 changes: 10 additions & 10 deletions cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9f56cf0

Please sign in to comment.