Remove memory ballast extension

open-telemetry · Jul 19, 2024 · f53bcf9 · f53bcf9
1 parent fbadc23
commit f53bcf9
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 857 deletions.
diff --git a/Makefile b/Makefile
@@ -286,7 +286,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  \
@@ -345,7 +344,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  \

diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml
@@ -23,7 +23,6 @@ exporters:
   - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.105.0
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.105.0
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.105.0
   - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.105.0
   - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.105.0
 processors:

diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml
@@ -23,7 +23,6 @@ exporters:
   - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.105.0
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.105.0
 extensions:
-  - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.105.0
   - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.105.0
   - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.105.0
 processors:
@@ -72,7 +71,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

diff --git a/cmd/otelcorecol/components.go b/cmd/otelcorecol/components.go
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol
 
 go 1.21.0
 
-toolchain go1.21.12
+toolchain go1.21.11
 
 require (
 	go.opentelemetry.io/collector/component v0.105.0
@@ -24,7 +24,6 @@ require (
 	go.opentelemetry.io/collector/exporter/otlpexporter v0.105.0
 	go.opentelemetry.io/collector/exporter/otlphttpexporter v0.105.0
 	go.opentelemetry.io/collector/extension v0.105.0
-	go.opentelemetry.io/collector/extension/ballastextension v0.105.0
 	go.opentelemetry.io/collector/extension/memorylimiterextension v0.105.0
 	go.opentelemetry.io/collector/extension/zpagesextension v0.105.0
 	go.opentelemetry.io/collector/otelcol v0.105.0
@@ -198,8 +197,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

diff --git a/component/config_test.go b/component/config_test.go
@@ -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"},

diff --git a/extension/README.md b/extension/README.md
@@ -10,7 +10,6 @@ performance profile.
 
 Supported service extensions (sorted alphabetically):
 
-- [Memory Ballast](ballastextension/README.md)
 - [zPages](zpagesextension/README.md)
 
 The [contributors
@@ -28,5 +27,5 @@ will be shutdown. The ordering is determined in the `extensions` tag under the
 service:
   # Extensions specified below are going to be loaded by the service in the
   # order given below, and shutdown on reverse order.
-  extensions: [memory_ballast, zpages]
+  extensions: [zpages]
 ```
diff --git a/extension/ballastextension/Makefile b/extension/ballastextension/Makefile
diff --git a/extension/ballastextension/README.md b/extension/ballastextension/README.md
diff --git a/extension/ballastextension/config.go b/extension/ballastextension/config.go
diff --git a/extension/ballastextension/config_test.go b/extension/ballastextension/config_test.go
diff --git a/extension/ballastextension/factory.go b/extension/ballastextension/factory.go
diff --git a/extension/ballastextension/factory_test.go b/extension/ballastextension/factory_test.go
diff --git a/extension/ballastextension/generated_component_test.go b/extension/ballastextension/generated_component_test.go
diff --git a/extension/ballastextension/generated_package_test.go b/extension/ballastextension/generated_package_test.go