From bf3e0d30b181427026ccc97943f22fd035409846 Mon Sep 17 00:00:00 2001 From: ChrsMark Date: Tue, 17 Dec 2024 12:39:06 +0200 Subject: [PATCH] remove refs to config/internal Signed-off-by: ChrsMark --- cmd/builder/internal/builder/main_test.go | 1 - cmd/builder/test/core.builder.yaml | 1 - cmd/otelcorecol/builder-config.yaml | 1 - cmd/otelcorecol/go.mod | 2 -- config/configgrpc/go.mod | 2 -- config/confighttp/go.mod | 2 -- config/confighttp/xconfighttp/go.mod | 2 -- exporter/otlpexporter/go.mod | 2 -- exporter/otlphttpexporter/go.mod | 2 -- extension/zpagesextension/go.mod | 2 -- internal/e2e/go.mod | 2 -- otelcol/go.mod | 2 -- otelcol/otelcoltest/go.mod | 2 -- receiver/otlpreceiver/go.mod | 2 -- service/go.mod | 2 -- versions.yaml | 1 - 16 files changed, 28 deletions(-) diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 824d73585c0..8220e48df85 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -52,7 +52,6 @@ var replaceModules = []string{ "/config/configretry", "/config/configtelemetry", "/config/configtls", - "/config/internal", "/confmap", "/confmap/provider/envprovider", "/confmap/provider/fileprovider", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 65626e77590..b866d53f882 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -27,7 +27,6 @@ replaces: - go.opentelemetry.io/collector/config/configretry => ${WORKSPACE_DIR}/config/configretry - go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls - - go.opentelemetry.io/collector/config/internal => ${WORKSPACE_DIR}/config/internal - go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap - go.opentelemetry.io/collector/confmap/provider/envprovider => ${WORKSPACE_DIR}/confmap/provider/envprovider - go.opentelemetry.io/collector/confmap/provider/fileprovider => ${WORKSPACE_DIR}/confmap/provider/fileprovider diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 22e883a53f9..02ce3a8c934 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -51,7 +51,6 @@ replaces: - go.opentelemetry.io/collector/config/configretry => ../../config/configretry - go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry - go.opentelemetry.io/collector/config/configtls => ../../config/configtls - - go.opentelemetry.io/collector/config/internal => ../../config/internal - go.opentelemetry.io/collector/confmap => ../../confmap - go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider - go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../confmap/provider/fileprovider diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index a7f788d34f6..c4655a98b68 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -186,8 +186,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 96dfc8f8fad..116e1451d98 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -68,8 +68,6 @@ replace go.opentelemetry.io/collector/config/configtls => ../configtls replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry -replace go.opentelemetry.io/collector/config/internal => ../internal - replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 8933263cdb5..75ddce82414 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -60,8 +60,6 @@ replace go.opentelemetry.io/collector/config/configtls => ../configtls replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry -replace go.opentelemetry.io/collector/config/internal => ../internal - replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth diff --git a/config/confighttp/xconfighttp/go.mod b/config/confighttp/xconfighttp/go.mod index c805baf7b0f..e67025dc73e 100644 --- a/config/confighttp/xconfighttp/go.mod +++ b/config/confighttp/xconfighttp/go.mod @@ -50,8 +50,6 @@ require ( replace go.opentelemetry.io/collector/config/confighttp => ../../confighttp -replace go.opentelemetry.io/collector/config/internal => ../../internal - replace go.opentelemetry.io/collector/config/configtelemetry => ../../configtelemetry replace go.opentelemetry.io/collector/client => ../../../client diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index b8dbb0b54b8..8bd3a2cb65b 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -96,8 +96,6 @@ replace go.opentelemetry.io/collector/config/configopaque => ../../config/config replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/exporter => ../ diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 4bf1932e387..45485795b51 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -98,8 +98,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/exporter => ../ diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 1175ba49cb0..35bbcc7c817 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -81,8 +81,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 8d2173e213e..76d13d66a64 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -141,8 +141,6 @@ replace go.opentelemetry.io/collector/config/configopaque => ../../config/config replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp diff --git a/otelcol/go.mod b/otelcol/go.mod index 44eee0446a7..440a6eb5dd4 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -157,8 +157,6 @@ replace go.opentelemetry.io/collector/config/configretry => ../config/configretr replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp -replace go.opentelemetry.io/collector/config/internal => ../config/internal - replace go.opentelemetry.io/collector/config/configauth => ../config/configauth replace go.opentelemetry.io/collector/extension/auth => ../extension/auth diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 9fe514daf9e..96aed1b0ae5 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -202,8 +202,6 @@ replace go.opentelemetry.io/collector/config/configcompression => ../../config/c replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index c18365a848a..fabee5c2983 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -98,8 +98,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls -replace go.opentelemetry.io/collector/config/internal => ../../config/internal - replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/extension => ../../extension diff --git a/service/go.mod b/service/go.mod index 131ca7925e4..e50017a3203 100644 --- a/service/go.mod +++ b/service/go.mod @@ -178,8 +178,6 @@ replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp replace go.opentelemetry.io/collector/config/configauth => ../config/configauth -replace go.opentelemetry.io/collector/config/internal => ../config/internal - replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression diff --git a/versions.yaml b/versions.yaml index abddc9ddd27..b43a032906b 100644 --- a/versions.yaml +++ b/versions.yaml @@ -37,7 +37,6 @@ module-sets: - go.opentelemetry.io/collector/config/confighttp - go.opentelemetry.io/collector/config/confighttp/xconfighttp - go.opentelemetry.io/collector/config/configtelemetry - - go.opentelemetry.io/collector/config/internal - go.opentelemetry.io/collector/connector - go.opentelemetry.io/collector/connector/connectortest - go.opentelemetry.io/collector/connector/forwardconnector