Skip to content

Commit c9058e6

Browse files
TylerHelmuthatoulmecrobert-1mx-psi
authored
[extension/ballast] Remove the deprecated memory ballast extension (#10671)
#### Description This PR removes the deprecated memory ballast extension and all the logic in place in memorylimiter and service that was using it. #### Link to tracking issue Related to #8343. I don't want to close it until the [helm chart](open-telemetry/opentelemetry-helm-charts#1268) is updated. #### Testing Unit tests --------- Co-authored-by: Antoine Toulme <[email protected]> Co-authored-by: Curtis Robert <[email protected]> Co-authored-by: Pablo Baeyens <[email protected]>
1 parent 48b11ba commit c9058e6

25 files changed

+25
-668
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. otlpreceiver)
7+
component: ballastextension
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Removes the deprecated ballastextension
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [10671]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ check-contrib:
293293
-replace go.opentelemetry.io/collector/extension=$(CURDIR)/extension \
294294
-replace go.opentelemetry.io/collector/extension/auth=$(CURDIR)/extension/auth \
295295
-replace go.opentelemetry.io/collector/extension/experimental/storage=$(CURDIR)/extension/experimental/storage \
296-
-replace go.opentelemetry.io/collector/extension/ballastextension=$(CURDIR)/extension/ballastextension \
297296
-replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \
298297
-replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \
299298
-replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \
@@ -358,7 +357,6 @@ restore-contrib:
358357
-dropreplace go.opentelemetry.io/collector/exporter/otlphttpexporter \
359358
-dropreplace go.opentelemetry.io/collector/extension \
360359
-dropreplace go.opentelemetry.io/collector/extension/auth \
361-
-dropreplace go.opentelemetry.io/collector/extension/ballastextension \
362360
-dropreplace go.opentelemetry.io/collector/extension/memorylimiterextension \
363361
-dropreplace go.opentelemetry.io/collector/extension/zpagesextension \
364362
-dropreplace go.opentelemetry.io/collector/featuregate \

cmd/builder/internal/config/default.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ exporters:
2323
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
2424
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
2525
extensions:
26-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.1
2726
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
2827
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
2928
processors:

cmd/otelcorecol/builder-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ exporters:
2323
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
2424
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
2525
extensions:
26-
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.108.1
2726
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
2827
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
2928
processors:
@@ -79,7 +78,6 @@ replaces:
7978
- go.opentelemetry.io/collector/extension => ../../extension
8079
- go.opentelemetry.io/collector/extension/auth => ../../extension/auth
8180
- go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
82-
- go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension
8381
- go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension
8482
- go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
8583
- go.opentelemetry.io/collector/featuregate => ../../featuregate

cmd/otelcorecol/components.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcorecol/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ require (
2323
go.opentelemetry.io/collector/exporter/otlpexporter v0.108.1
2424
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.108.1
2525
go.opentelemetry.io/collector/extension v0.108.1
26-
go.opentelemetry.io/collector/extension/ballastextension v0.108.1
2726
go.opentelemetry.io/collector/extension/memorylimiterextension v0.108.1
2827
go.opentelemetry.io/collector/extension/zpagesextension v0.108.1
2928
go.opentelemetry.io/collector/otelcol v0.108.1
@@ -224,8 +223,6 @@ replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
224223

225224
replace go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
226225

227-
replace go.opentelemetry.io/collector/extension/ballastextension => ../../extension/ballastextension
228-
229226
replace go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension
230227

231228
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension

component/config_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ func TestNewType(t *testing.T) {
313313
{name: "loki"},
314314
{name: "mdatagen"},
315315
{name: "memcached"},
316-
{name: "memory_ballast"},
317316
{name: "memory_limiter"},
318317
{name: "metricstransform"},
319318
{name: "mezmo"},

extension/ballastextension/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

extension/ballastextension/README.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

extension/ballastextension/config.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)