From f990e99b690f05ca99f8eca9bf9070189f6edd6c Mon Sep 17 00:00:00 2001 From: Mostyn Bramley-Moore Date: Thu, 29 Jun 2023 22:21:21 +0200 Subject: [PATCH] Upgrade github.com/mostynb/go-grpc-compression and switch to nonclobbering imports (#7966) **Description:** Switch to grpc encoders that won't override the consumer's previously registered codecs. Some consumers of this library have registered grpc compressors, and the init() order can cause their compressors to be clobbered by opentelemetry-collector's use of github.com/mostynb/go-grpc-compression, which follows the pattern from the grpc-go library (overwrite any previously registered encoders with the same name). Version 1.2.0 of github.com/mostynb/go-grpc-compression added so-called "nonclobbering" imports, which only register the codec if there is not already a codec registered with that name. This PR switches to use those. **Link to tracking Issue:** #7920 **Testing:** tests have been added to the upstream library. --- .../nonclobbering_go_grpc_compression.yaml | 16 ++++++++ config/configgrpc/configgrpc.go | 4 +- .../configgrpc/configgrpc_benchmark_test.go | 4 +- config/configgrpc/go.mod | 6 +++ config/confighttp/go.mod | 6 +++ connector/forwardconnector/go.mod | 20 ++++++++++ connector/go.mod | 20 ++++++++++ consumer/go.mod | 20 ++++++++++ exporter/go.mod | 20 ++++++++++ exporter/loggingexporter/go.mod | 20 ++++++++++ exporter/otlpexporter/go.mod | 6 +++ exporter/otlphttpexporter/go.mod | 2 + extension/ballastextension/go.mod | 20 ++++++++++ extension/zpagesextension/go.mod | 20 ++++++++++ go.mod | 38 +++++++++++++++++++ go.sum | 36 ++++++++++++++++++ processor/batchprocessor/go.mod | 20 ++++++++++ processor/go.mod | 20 ++++++++++ processor/memorylimiterprocessor/go.mod | 18 +++++++++ receiver/go.mod | 20 ++++++++++ receiver/otlpreceiver/go.mod | 2 + 21 files changed, 334 insertions(+), 4 deletions(-) create mode 100755 .chloggen/nonclobbering_go_grpc_compression.yaml diff --git a/.chloggen/nonclobbering_go_grpc_compression.yaml b/.chloggen/nonclobbering_go_grpc_compression.yaml new file mode 100755 index 00000000000..8c588f4de98 --- /dev/null +++ b/.chloggen/nonclobbering_go_grpc_compression.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otlpreceiver, otlphttpexporter, otlpexporter, configgrpc + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Upgrade github.com/mostynb/go-grpc-compression and switch to nonclobbering imports + +# One or more tracking issues or pull requests related to the change +issues: [7920] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: consumers of this library should not have their grpc codecs overridden diff --git a/config/configgrpc/configgrpc.go b/config/configgrpc/configgrpc.go index 5cdbb18065d..6f216eff2f9 100644 --- a/config/configgrpc/configgrpc.go +++ b/config/configgrpc/configgrpc.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/mostynb/go-grpc-compression/snappy" - "github.com/mostynb/go-grpc-compression/zstd" + "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" + "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" "google.golang.org/grpc" diff --git a/config/configgrpc/configgrpc_benchmark_test.go b/config/configgrpc/configgrpc_benchmark_test.go index 13dea179596..d1fc95f772b 100644 --- a/config/configgrpc/configgrpc_benchmark_test.go +++ b/config/configgrpc/configgrpc_benchmark_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "github.com/mostynb/go-grpc-compression/snappy" - "github.com/mostynb/go-grpc-compression/zstd" + "github.com/mostynb/go-grpc-compression/nonclobbering/snappy" + "github.com/mostynb/go-grpc-compression/nonclobbering/zstd" "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/gzip" diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 6a8f27a9157..ffcd904c8bb 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -117,3 +117,9 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/semconv => ../../semconv replace go.opentelemetry.io/collector/consumer => ../../consumer + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/confighttp => ../confighttp + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index c116059700a..b05add2a62f 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -92,3 +92,9 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/semconv => ../../semconv replace go.opentelemetry.io/collector/consumer => ../../consumer + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/configgrpc => ../configgrpc + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 14d3dd9c471..6b83dad7fd2 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -75,3 +75,23 @@ retract ( replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +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/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp diff --git a/connector/go.mod b/connector/go.mod index 4b461dfabca..84314fe2483 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -67,3 +67,23 @@ replace go.opentelemetry.io/collector/semconv => ../semconv replace go.opentelemetry.io/collector/exporter => ../exporter replace go.opentelemetry.io/collector/config/confignet => ../config/confignet + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/configgrpc => ../config/configgrpc + +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 diff --git a/consumer/go.mod b/consumer/go.mod index d54ea6077ba..31427e1cb7f 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -59,3 +59,23 @@ replace go.opentelemetry.io/collector/connector => ../connector replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/configgrpc => ../config/configgrpc diff --git a/exporter/go.mod b/exporter/go.mod index 91717976627..306911d8550 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -92,3 +92,23 @@ replace go.opentelemetry.io/collector/connector => ../connector replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/config/configgrpc => ../config/configgrpc + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index df139754d66..c21ecb18dc7 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -81,3 +81,23 @@ replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index e4ec69c01f5..e131f1d3163 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -111,3 +111,9 @@ retract ( replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 88accbdefa0..ac9600e08cc 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -122,3 +122,5 @@ retract ( // ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules replace cloud.google.com/go => cloud.google.com/go v0.110.2 + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index b29e7d12727..af1bfcb48db 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -78,3 +78,23 @@ replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/extension/auth => ../auth + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 6d4555d2a1c..ac081afeb95 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -74,3 +74,23 @@ retract ( replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/extension/auth => ../auth + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque diff --git a/go.mod b/go.mod index 3ad8079d928..8f42d856382 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,8 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.4 // indirect @@ -54,8 +56,10 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.16.6 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -64,15 +68,29 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mostynb/go-grpc-compression v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/procfs v0.10.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect + github.com/rs/cors v1.9.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.opentelemetry.io/collector/config/configauth v0.80.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.80.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.80.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.80.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.80.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.80.0 // indirect + go.opentelemetry.io/collector/config/internal v0.80.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.80.0 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.80.0 // indirect + go.opentelemetry.io/collector/receiver/otlpreceiver v0.80.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/zpages v0.42.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.11.0 // indirect @@ -117,3 +135,23 @@ retract ( v0.57.0 // Release failed, use v0.57.2 v0.32.0 // Contains incomplete metrics transition to proto 0.9.0, random components are not working. ) + +replace go.opentelemetry.io/collector/config/internal => ./config/internal + +replace go.opentelemetry.io/collector/config/configopaque => ./config/configopaque + +replace go.opentelemetry.io/collector/config/confighttp => ./config/confighttp + +replace go.opentelemetry.io/collector/config/configauth => ./config/configauth + +replace go.opentelemetry.io/collector/config/configtls => ./config/configtls + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ./processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/configcompression => ./config/configcompression + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ./receiver/otlpreceiver + +replace go.opentelemetry.io/collector/extension/auth => ./extension/auth + +replace go.opentelemetry.io/collector/config/configgrpc => ./config/configgrpc diff --git a/go.sum b/go.sum index d5a993eda0b..5d2eecf11fb 100644 --- a/go.sum +++ b/go.sum @@ -88,8 +88,11 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -151,6 +154,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -241,6 +246,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= +github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs= github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -291,6 +298,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mostynb/go-grpc-compression v1.2.0 h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI= +github.com/mostynb/go-grpc-compression v1.2.0/go.mod h1:oidYvYyefMmhcuvU8fLJ8FfZyTyVzJ6SkmD5fIKgRe8= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= @@ -348,6 +357,8 @@ github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8d github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= +github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -405,6 +416,30 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/collector/config/configauth v0.80.0 h1:+8zH36zhLNp/efwxoJwdp1ORIV/RkjoTp9I3OOzvpOE= +go.opentelemetry.io/collector/config/configauth v0.80.0/go.mod h1:F0W34vz4zbqFhxJjvpwDKIaKE2t1baGuhEqreTQJTI0= +go.opentelemetry.io/collector/config/configcompression v0.80.0 h1:lmSOh1Y+tYK/Nzr6ge7V3Oe2csxj3/Q/cUFuEvEQ2kU= +go.opentelemetry.io/collector/config/configcompression v0.80.0/go.mod h1:xhHm1sEH7BTECAJo1xn64NMxeIvZGKdVGdSKUUc+YuM= +go.opentelemetry.io/collector/config/configgrpc v0.80.0 h1:xpPu+FNnJR3fcqg+JxBvMBIA+xtn3iv4/bWIEQCwIT4= +go.opentelemetry.io/collector/config/configgrpc v0.80.0/go.mod h1:3xKnuF9F8JqnbXz8vEN7ySasEFATwAea/lGVld4BBRo= +go.opentelemetry.io/collector/config/confighttp v0.80.0 h1:B2wkgDTs8kmzLDhm3zEKAq7TvjEyEHVuL0pc75Sv0mo= +go.opentelemetry.io/collector/config/confighttp v0.80.0/go.mod h1:uj8coqg+AGHi3PAlVxDNIBjs5QrS499Ab+ywo6KwvBA= +go.opentelemetry.io/collector/config/configopaque v0.80.0 h1:+Jwkd/X9jtbj3PkFk+p6H3GdD/qEREOJ47L+hs12ckw= +go.opentelemetry.io/collector/config/configopaque v0.80.0/go.mod h1:pM1oy6gasukw3H6jAvc9Q9OtFaaY2IbfeuwCPAjOgXc= +go.opentelemetry.io/collector/config/configtls v0.80.0 h1:0NwckEIIzXv2Zz+rLswHb37jsDmMnqo2O4/Fl/+2KFM= +go.opentelemetry.io/collector/config/configtls v0.80.0/go.mod h1:fO1VgdtrcgcVA3Y2vB/YQvTh2tNNFW0R0NjWrtvjTOQ= +go.opentelemetry.io/collector/config/internal v0.80.0 h1:9mOlmdHiaNKS5HTVJ1+COx/URDjzX0zvUKcbsLC6S8k= +go.opentelemetry.io/collector/config/internal v0.80.0/go.mod h1:RKcLV1gQxhgwx+6rlPYsvGMq1RZNne3UeOUZkHxJnIg= +go.opentelemetry.io/collector/extension/auth v0.80.0 h1:BElM8HXYVho2ZikMS8OpQQjmaMizB3qFGJ+kGZ4cyoI= +go.opentelemetry.io/collector/extension/auth v0.80.0/go.mod h1:wDpwb37PxV/aH/kecpPXtJqGSmiOYUyeLuQvRmWciAA= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.80.0 h1:ZK9GRIjqHB74LIUwhCUv7tWO0HlVMdqpo0kTNs2TkF8= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.80.0/go.mod h1:Saosjjmi1q1vkLJ8EH/jTvhp37/tTPDa2Sa28G8jCqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.80.0 h1:oWWztTJlNOp81JE27DRaHKJnyAympUn5boDI7dVG78I= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.80.0/go.mod h1:bb6RD5rDEwuruBw/yRlAQ4a3e0VpD1jKNztqbPnvC3k= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 h1:mdcNStUIXngF/mH3xxAo4nbR4g65IXqLL1SvYMjz7JQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17/go.mod h1:N2Nw/UmmvQn0yCnaUzvsWzTWIeffYIdFteg6mxqCWII= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= go.opentelemetry.io/contrib/zpages v0.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= @@ -589,6 +624,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 9ec1b10d606..94d6c1f72f8 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -96,3 +96,23 @@ replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression + +replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../memorylimiterprocessor diff --git a/processor/go.mod b/processor/go.mod index 3e277af49ee..0be3d37ffaf 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -68,3 +68,23 @@ replace go.opentelemetry.io/collector/connector => ../connector replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ./memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/configgrpc => ../config/configgrpc diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 383becd25e6..c22a53d9e1f 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -85,3 +85,21 @@ replace go.opentelemetry.io/collector/connector => ../../connector replace go.opentelemetry.io/collector/config/confignet => ../../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver + +replace go.opentelemetry.io/collector/config/internal => ../../config/internal + +replace go.opentelemetry.io/collector/config/configgrpc => ../../config/configgrpc + +replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp + +replace go.opentelemetry.io/collector/config/configauth => ../../config/configauth + +replace go.opentelemetry.io/collector/config/configopaque => ../../config/configopaque + +replace go.opentelemetry.io/collector/config/configtls => ../../config/configtls + +replace go.opentelemetry.io/collector/config/configcompression => ../../config/configcompression diff --git a/receiver/go.mod b/receiver/go.mod index 37ecd62e181..63f0570b6cc 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -90,3 +90,23 @@ replace go.opentelemetry.io/collector/connector => ../connector replace go.opentelemetry.io/collector/config/confignet => ../config/confignet replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/config/internal => ../config/internal + +replace go.opentelemetry.io/collector/config/confighttp => ../config/confighttp + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../processor/memorylimiterprocessor + +replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/config/configauth => ../config/configauth + +replace go.opentelemetry.io/collector/extension/auth => ../extension/auth + +replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression + +replace go.opentelemetry.io/collector/receiver/otlpreceiver => ./otlpreceiver + +replace go.opentelemetry.io/collector/config/configtls => ../config/configtls + +replace go.opentelemetry.io/collector/config/configgrpc => ../config/configgrpc diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index bc0deb13473..e273da14793 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -132,3 +132,5 @@ retract ( v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1 v0.69.0 // Release failed, use v0.69.1 ) + +replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor