Merge branch 'open-telemetry:main' into automate-version-update-artif…

…act-release
open-telemetry · Oct 3, 2024 · 8a9a1e8 · 8a9a1e8
2 parents 56cd0ef + edc8e94
commit 8a9a1e8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml
@@ -38,7 +38,6 @@ extensions:
 
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0
-  - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0
@@ -225,8 +224,6 @@ providers:
 
 # When adding a replace, add a comment before it to document why it's needed and when it can be removed
 replaces:
-  # See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/12322#issuecomment-1185029670
-  - github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 => github.com/docker/go-connections v0.4.0
   # see https://github.com/mattn/go-ieproxy/issues/45
   - github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1
   # see https://github.com/openshift/api/pull/1515

diff --git a/distributions/otelcol/manifest.yaml b/distributions/otelcol/manifest.yaml
@@ -18,7 +18,6 @@ receivers:
 
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0
-  - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0
   - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0