From ef07da2eb81d332f17959497a5c2944844e6cc7b Mon Sep 17 00:00:00 2001 From: James Moessis Date: Tue, 19 Jul 2022 12:22:25 +1000 Subject: [PATCH 1/2] add replace for go-connections bad version --- distributions/otelcol-contrib/manifest.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 80786b93..0d2fade9 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -167,3 +167,5 @@ receivers: replaces: # See https://github.com/google/gnostic/issues/262 - github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5 + # See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/12322#issuecomment-1185029670 + - replace github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 => github.com/docker/go-connections v0.4.0 \ No newline at end of file From 74a0ba2d49e0b9f41d53cd7687237bbb05c98149 Mon Sep 17 00:00:00 2001 From: James Moessis Date: Tue, 19 Jul 2022 12:25:27 +1000 Subject: [PATCH 2/2] fix typo --- distributions/otelcol-contrib/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/otelcol-contrib/manifest.yaml b/distributions/otelcol-contrib/manifest.yaml index 0d2fade9..7dc7d663 100644 --- a/distributions/otelcol-contrib/manifest.yaml +++ b/distributions/otelcol-contrib/manifest.yaml @@ -168,4 +168,4 @@ replaces: # See https://github.com/google/gnostic/issues/262 - github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5 # See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/12322#issuecomment-1185029670 - - replace github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 => github.com/docker/go-connections v0.4.0 \ No newline at end of file + - github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 => github.com/docker/go-connections v0.4.0 \ No newline at end of file