Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[extension/ballast] Remove the deprecated memory ballast extension #10671

Merged
merged 11 commits into from
Sep 4, 2024
Merged
25 changes: 25 additions & 0 deletions .chloggen/remove-ballast-extension.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 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. otlpreceiver)
component: ballastextension

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Removes the deprecated ballastextension

# One or more tracking issues or pull requests related to the change
issues: [10671]
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved

# (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:

# 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: []
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ check-contrib:
-replace go.opentelemetry.io/collector/exporter/otlphttpexporter=$(CURDIR)/exporter/otlphttpexporter \
-replace go.opentelemetry.io/collector/extension=$(CURDIR)/extension \
-replace go.opentelemetry.io/collector/extension/auth=$(CURDIR)/extension/auth \
-replace go.opentelemetry.io/collector/extension/ballastextension=$(CURDIR)/extension/ballastextension \
-replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \
-replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \
-replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \
Expand Down Expand Up @@ -355,7 +354,6 @@ restore-contrib:
-dropreplace go.opentelemetry.io/collector/exporter/otlphttpexporter \
-dropreplace go.opentelemetry.io/collector/extension \
-dropreplace go.opentelemetry.io/collector/extension/auth \
-dropreplace go.opentelemetry.io/collector/extension/ballastextension \
-dropreplace go.opentelemetry.io/collector/extension/memorylimiterextension \
-dropreplace go.opentelemetry.io/collector/extension/zpagesextension \
-dropreplace go.opentelemetry.io/collector/featuregate \
Expand Down
1 change: 0 additions & 1 deletion cmd/builder/internal/config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ exporters:
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
processors:
Expand Down
2 changes: 0 additions & 2 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ exporters:
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
processors:
Expand Down Expand Up @@ -76,7 +75,6 @@ replaces:
- go.opentelemetry.io/collector/exporter/otlphttpexporter => ../../exporter/otlphttpexporter
- go.opentelemetry.io/collector/extension => ../../extension
- go.opentelemetry.io/collector/extension/auth => ../../extension/auth
- go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension
- go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension
- go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
- go.opentelemetry.io/collector/featuregate => ../../featuregate
Expand Down
3 changes: 0 additions & 3 deletions cmd/otelcorecol/components.go

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

3 changes: 0 additions & 3 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ require (
go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
go.opentelemetry.io/collector/extension v0.108.1
go.opentelemetry.io/collector/extension/ballastextension v0.108.1
go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
go.opentelemetry.io/collector/otelcol v0.108.1
Expand Down Expand Up @@ -215,8 +214,6 @@ replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth

replace go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension

replace go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension

replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
Expand Down
1 change: 0 additions & 1 deletion component/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ func TestNewType(t *testing.T) {
{name: "loki"},
{name: "mdatagen"},
{name: "memcached"},
{name: "memory_ballast"},
{name: "memory_limiter"},
{name: "metricstransform"},
{name: "mezmo"},
Expand Down
1 change: 0 additions & 1 deletion extension/ballastextension/Makefile

This file was deleted.

63 changes: 0 additions & 63 deletions extension/ballastextension/README.md

This file was deleted.

28 changes: 0 additions & 28 deletions extension/ballastextension/config.go

This file was deleted.

42 changes: 0 additions & 42 deletions extension/ballastextension/config_test.go

This file was deleted.

31 changes: 0 additions & 31 deletions extension/ballastextension/factory.go

This file was deleted.

32 changes: 0 additions & 32 deletions extension/ballastextension/factory_test.go

This file was deleted.

50 changes: 0 additions & 50 deletions extension/ballastextension/generated_component_test.go

This file was deleted.

13 changes: 0 additions & 13 deletions extension/ballastextension/generated_package_test.go

This file was deleted.

Loading
Loading