From 5549d70c9c6dfa8b6d3f562f79ef3f9e8bb38455 Mon Sep 17 00:00:00 2001 From: Robert Lin Date: Tue, 16 Jan 2024 12:21:21 -0800 Subject: [PATCH] tracing: fix regressions from OpenTelemetry upgrades (#59649) This change reverts https://github.com/sourcegraph/sourcegraph/pull/59647 and fixes regressions from recent OpenTelemetry upgrades: 1. #59564 introduces a regression on trace propagation in gRPC 2. #59613 introduces a panic on the OTLP adapter for clients ## Test plan ``` sg start ``` ![image](https://github.com/sourcegraph/sourcegraph/assets/23356519/3ec59794-1550-49e0-ad5e-38b3293c116a) --- cmd/frontend/internal/app/otlpadapter/otlp.go | 10 +- .../internal/app/otlpadapter/register.go | 6 + deps.bzl | 182 ++++++++---------- .../builder.template.yaml | 4 +- go.mod | 62 +++--- go.sum | 136 ++++++------- internal/grpc/defaults/defaults.go | 6 +- wolfi-packages/opentelemetry-collector.yaml | 2 +- .../builder.template.yaml | 7 +- 9 files changed, 204 insertions(+), 211 deletions(-) diff --git a/cmd/frontend/internal/app/otlpadapter/otlp.go b/cmd/frontend/internal/app/otlpadapter/otlp.go index 2581a328657..d9c163b437d 100644 --- a/cmd/frontend/internal/app/otlpadapter/otlp.go +++ b/cmd/frontend/internal/app/otlpadapter/otlp.go @@ -51,8 +51,14 @@ func newReceiver(receiverURL *url.URL) (receiver.Factory, component.Config) { receiverFactory := otlpreceiver.NewFactory() signalReceiverConfig := receiverFactory.CreateDefaultConfig().(*otlpreceiver.Config) signalReceiverConfig.GRPC = nil // disable gRPC receiver, we don't need it - signalReceiverConfig.HTTP = &confighttp.HTTPServerSettings{ - Endpoint: receiverURL.Host, + signalReceiverConfig.HTTP = &otlpreceiver.HTTPConfig{ + HTTPServerSettings: &confighttp.HTTPServerSettings{ + Endpoint: receiverURL.Host, + }, + // Set explicit defaults based on docstrings of each field. + TracesURLPath: "/v1/traces", + MetricsURLPath: "/v1/metrics", + LogsURLPath: "/v1/logs", } return receiverFactory, signalReceiverConfig diff --git a/cmd/frontend/internal/app/otlpadapter/register.go b/cmd/frontend/internal/app/otlpadapter/register.go index 84f99d01d15..f738f9cd567 100644 --- a/cmd/frontend/internal/app/otlpadapter/register.go +++ b/cmd/frontend/internal/app/otlpadapter/register.go @@ -47,6 +47,12 @@ func Register(ctx context.Context, logger log.Logger, protocol otlpenv.Protocol, MeterProvider: metric.NewMeterProvider(), MetricsLevel: configtelemetry.LevelBasic, + + ReportStatus: func(event *component.StatusEvent) { + if err := event.Err(); err != nil { + logger.Warn(event.Status().String(), log.Error(err)) + } + }, } componentName := "otlpadapter" diff --git a/deps.bzl b/deps.bzl index 6a8d5a772c7..9a07478fdf9 100644 --- a/deps.bzl +++ b/deps.bzl @@ -1873,8 +1873,8 @@ def go_dependencies(): name = "com_github_fsnotify_fsnotify", build_file_proto_mode = "disable_global", importpath = "github.com/fsnotify/fsnotify", - sum = "h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=", - version = "v1.6.0", + sum = "h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=", + version = "v1.7.0", ) go_repository( name = "com_github_fullstorydev_grpcui", @@ -3914,8 +3914,8 @@ def go_dependencies(): name = "com_github_klauspost_compress", build_file_proto_mode = "disable_global", importpath = "github.com/klauspost/compress", - sum = "h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=", - version = "v1.16.7", + sum = "h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=", + version = "v1.17.4", ) go_repository( name = "com_github_klauspost_cpuid_v2", @@ -4537,8 +4537,8 @@ def go_dependencies(): name = "com_github_mostynb_go_grpc_compression", build_file_proto_mode = "disable_global", importpath = "github.com/mostynb/go-grpc-compression", - sum = "h1:KJzRFSYPXlcoYjG5/xLZB8tpuOyWF2UnlW4tAuaWnfI=", - version = "v1.2.0", + sum = "h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI=", + version = "v1.2.2", ) go_repository( name = "com_github_mpvl_unique", @@ -4932,8 +4932,8 @@ def go_dependencies(): name = "com_github_pierrec_lz4_v4", build_file_proto_mode = "disable_global", importpath = "github.com/pierrec/lz4/v4", - sum = "h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=", - version = "v4.1.17", + sum = "h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=", + version = "v4.1.18", ) go_repository( name = "com_github_pingcap_errors", @@ -5287,8 +5287,8 @@ def go_dependencies(): name = "com_github_rs_cors", build_file_proto_mode = "disable_global", importpath = "github.com/rs/cors", - sum = "h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=", - version = "v1.9.0", + sum = "h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=", + version = "v1.10.1", ) go_repository( name = "com_github_rs_xid", @@ -5449,8 +5449,8 @@ def go_dependencies(): name = "com_github_shirou_gopsutil_v3", build_file_proto_mode = "disable_global", importpath = "github.com/shirou/gopsutil/v3", - sum = "h1:5SgDCeQ0KW0S4N0znjeM/eFHXXOKyv2dVNgRq/c9P6Y=", - version = "v3.23.5", + sum = "h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4=", + version = "v3.23.12", ) go_repository( name = "com_github_shoenig_go_m1cpu", @@ -5769,8 +5769,8 @@ def go_dependencies(): name = "com_github_spf13_cobra", build_file_proto_mode = "disable_global", importpath = "github.com/spf13/cobra", - sum = "h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=", - version = "v1.7.0", + sum = "h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=", + version = "v1.8.0", ) go_repository( name = "com_github_spf13_jwalterweatherman", @@ -5926,15 +5926,15 @@ def go_dependencies(): name = "com_github_tklauser_go_sysconf", build_file_proto_mode = "disable_global", importpath = "github.com/tklauser/go-sysconf", - sum = "h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=", - version = "v0.3.11", + sum = "h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=", + version = "v0.3.12", ) go_repository( name = "com_github_tklauser_numcpus", build_file_proto_mode = "disable_global", importpath = "github.com/tklauser/numcpus", - sum = "h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=", - version = "v0.6.0", + sum = "h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=", + version = "v0.6.1", ) go_repository( name = "com_github_tmc_grpc_websocket_proxy", @@ -7669,183 +7669,176 @@ def go_dependencies(): name = "io_opentelemetry_go_collector", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector", - sum = "h1:pF+sB8xNXlg/W0a0QTLz4mUWyool1a9toVj8LmLoFqg=", - version = "v0.81.0", + sum = "h1:XiC0ptaT1EmOkK2RI0gt3n2tkzLAkNQGf0E7hrGdyeA=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_component", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/component", - sum = "h1:AKsl6bss/SRrW248GFpmGiiI/4kdemW92Ai/X82CCqY=", - version = "v0.81.0", + sum = "h1:/tRgPT1hr4KNB8ABHa0oJsjJFRZ5oiCIYHcTpZGwm9s=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configauth", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configauth", - sum = "h1:NIiJuIGOdblN0EIJv64R2mvGhthcYfWuvyCnjk8HRN4=", - version = "v0.81.0", + sum = "h1:m4O5QLerdsuWYEV8bZGZWDHnM8TtHkr52q9r6hAkasw=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configcompression", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configcompression", - sum = "h1:Q725pvVH7tR6BP3WK7Ro3pbqMeQdZEV3KeFVHchBxCc=", - version = "v0.81.0", + sum = "h1:LtHx4ZkW3BMxa4CfQGMOE7+ZhXvd4W10Pxa91Hr8IL0=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configgrpc", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configgrpc", - sum = "h1:Q2xEE2SGbg79j3TdHT+781eUu/2uUIyrHVJAG9bLpVk=", - version = "v0.81.0", + sum = "h1:vXUlGdAfg8ZvzkCyYx5+eagbzj2cQK306C3tZpWb7hY=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_confighttp", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/confighttp", - sum = "h1:vIdiepUT7P/WtJRdfh8mjzvSqJRVF8/vl9GWtUNQlHQ=", - version = "v0.81.0", + sum = "h1:O1iAgwVJBnHgLqzHMBBbI0pa0nBZHalTQrFQGwiEuiE=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_confignet", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/confignet", - sum = "h1:Eu8m3eX8GaGhOUc//YXvV4i3cEivxUSxkLnV1U9ydhg=", - version = "v0.81.0", + sum = "h1:4B4Ir68P+ew3nVz2/9lBN+KGXtkETPqErM8nQCg8tFo=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configopaque", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configopaque", - sum = "h1:MkCAGh0WydRWydETB9FLnuCj9hDPDiz2g4Wxnl53I0w=", - version = "v0.81.0", + sum = "h1:YvUSVa3Vxt2gSl5SwEohtn9HG0+8bO4zuAOCVICBIVU=", + version = "v0.92.0", + ) + go_repository( + name = "io_opentelemetry_go_collector_config_configretry", + build_file_proto_mode = "disable_global", + importpath = "go.opentelemetry.io/collector/config/configretry", + sum = "h1:3WUabmCRIBHSkOLGCHGieUGchlHkBw3Fa4Cj9Do5Xdw=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configtelemetry", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configtelemetry", - sum = "h1:j3dhWbAcrfL1n0RmShRJf99X/xIMoPfEShN/5Z8bY0k=", - version = "v0.81.0", + sum = "h1:iCfxJ2DhWVOAHpGgkWUZRfUvUPyWGhpVRCqjPQ2D87Y=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_configtls", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/configtls", - sum = "h1:2vt+yOZUvGq5ADqFAxL5ONm1ACuGXDSs87AWT54Ez4M=", - version = "v0.81.0", + sum = "h1:jJHZvRp8CZ76IYbhHdGgGosBMQ/EShQAc0NlE3/tlHk=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_config_internal", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/config/internal", - sum = "h1:wRV2PBnJygdmKpIdt/xfG7zdQvXvHz9L+z8MhGsOji4=", - version = "v0.81.0", + sum = "h1:1GCj5swGzCZQphHqzt1OSsA/vOmAgFLoydY8bBqAhs4=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_confmap", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/confmap", - sum = "h1:AqweoBGdF3jGM2/KgP5GS6bmN+1aVrEiCy4nPf7IBE4=", - version = "v0.81.0", - ) - go_repository( - name = "io_opentelemetry_go_collector_connector", - build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/collector/connector", - sum = "h1:5jYYjQwxxgJKFtVvvbFLd0+2QHsvS0z+lVDxzmRv8uk=", - version = "v0.81.0", + sum = "h1:xz20zNIvF9ZA1eWE+MZmZunmdXPIP/fr33ZvU0QUSxg=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_consumer", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/consumer", - sum = "h1:8R2iCrSzD7T0RtC2Wh4GXxDiqla2vNhDokGW6Bcrfas=", - version = "v0.81.0", + sum = "h1:twa8T0iR9KVglvRbwZ5OPKLXPCC2DO6gVhrgDZ47MPE=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_exporter", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/exporter", - sum = "h1:GLhB8WGrBx+zZSB1HIOx2ivFUMahGtAVO2CC5xbCUHQ=", - version = "v0.81.0", + sum = "h1:z6u+/hswJUuZbuPYIF2gXMZsqjIDd/tJO60XjLM850U=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_exporter_otlpexporter", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/exporter/otlpexporter", - sum = "h1:Ri5pj0slm+FUbbG81UIhQaQ992z2+PcT2++4JI32XGI=", - version = "v0.81.0", + sum = "h1:t1Bw82ziGkilLdGFU7r7EeXrK+sH5V/iwafEeFD/kik=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_exporter_otlphttpexporter", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/exporter/otlphttpexporter", - sum = "h1:KSE7wjy1J0I0izLTodTW4axRmJplpQgCRqYFbAzufZo=", - version = "v0.81.0", + sum = "h1:dWlGND+W4j7yBX6j3um+Co9sfjq4aVitMO1SSUQkjrA=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_extension", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/extension", - sum = "h1:Ak7AzZzxTFJxGyVbEklsGzqHyOHW5USiifJilCcRyTU=", - version = "v0.81.0", + sum = "h1:zaehgW+LXCMNEb1d6Af/VHWphh5ZwX9aZl+NuQLGhpQ=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_extension_auth", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/extension/auth", - sum = "h1:UzVQSG9naJh1hX7hh+HVcvB3n+rpCJXX2BBdUoL/Ybo=", - version = "v0.81.0", - ) - go_repository( - name = "io_opentelemetry_go_collector_extension_zpagesextension", - build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/collector/extension/zpagesextension", - sum = "h1:ov3h5re95uJcF6N+vR/rLpjsEkGs6easxXSphH9UrPg=", - version = "v0.81.0", + sum = "h1:FlCObeiYXsVStltFivg+gD5PSFUM6dXHigkgkUMitv0=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_featuregate", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/featuregate", - sum = "h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U=", - version = "v1.0.0-rcv0013", + sum = "h1:ok//hLSXttBbyu4sSV1pTx1nKdr5udSmrWy5sFMIIbM=", + version = "v1.0.1", ) go_repository( name = "io_opentelemetry_go_collector_pdata", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/pdata", - sum = "h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k=", - version = "v1.0.0-rcv0013", + sum = "h1:dGX2h7maA6zHbl5D3AsMnF1c3Nn+3EUftbVCLzeyNvA=", + version = "v1.0.1", ) go_repository( name = "io_opentelemetry_go_collector_processor", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/processor", - sum = "h1:ypyNV5R0bnN3XGMAsH/q5eNARF5vXtFgSOK9rBWzsLc=", - version = "v0.81.0", + sum = "h1:fbtBPdtQbFZWOhPfgx6LXZM0fwQRHvjE3NeJS1d1GPg=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_receiver", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/receiver", - sum = "h1:0c+YtIV7fmd9ev+zmwS9qjx5ASi8cw+gSypu4I7Gugc=", - version = "v0.81.0", + sum = "h1:TRz4ufr5bFEszpAWgYVEx/b7VPZzEcECsyMzztf5PsQ=", + version = "v0.92.0", ) go_repository( name = "io_opentelemetry_go_collector_receiver_otlpreceiver", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/collector/receiver/otlpreceiver", - sum = "h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c=", - version = "v0.81.0", + sum = "h1:77oFMYYJfRu4yqlRkExMHDieg9gPv38UsMtK/0cu5kU=", + version = "v0.92.0", ) go_repository( - name = "io_opentelemetry_go_collector_semconv", + name = "io_opentelemetry_go_contrib_config", build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/collector/semconv", - sum = "h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw=", - version = "v0.81.0", + importpath = "go.opentelemetry.io/contrib/config", + sum = "h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ=", + version = "v0.1.1", ) go_repository( name = "io_opentelemetry_go_contrib_detectors_gcp", @@ -7886,13 +7879,6 @@ def go_dependencies(): sum = "h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=", version = "v0.46.1", ) - go_repository( - name = "io_opentelemetry_go_contrib_propagators_b3", - build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/contrib/propagators/b3", - sum = "h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo=", - version = "v1.17.0", - ) go_repository( name = "io_opentelemetry_go_contrib_propagators_jaeger", build_file_proto_mode = "disable_global", @@ -7907,13 +7893,6 @@ def go_dependencies(): sum = "h1:3TN5vkXjKYWp0YdMcnUEC/A+pBPvqz9V3nCS2xmcurk=", version = "v1.21.1", ) - go_repository( - name = "io_opentelemetry_go_contrib_zpages", - build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/contrib/zpages", - sum = "h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q=", - version = "v0.42.0", - ) go_repository( name = "io_opentelemetry_go_otel", build_file_proto_mode = "disable_global", @@ -7921,13 +7900,6 @@ def go_dependencies(): sum = "h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=", version = "v1.21.0", ) - go_repository( - name = "io_opentelemetry_go_otel_bridge_opencensus", - build_file_proto_mode = "disable_global", - importpath = "go.opentelemetry.io/otel/bridge/opencensus", - sum = "h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ=", - version = "v0.39.0", - ) go_repository( name = "io_opentelemetry_go_otel_bridge_opentracing", build_file_proto_mode = "disable_global", @@ -7992,8 +7964,8 @@ def go_dependencies(): name = "io_opentelemetry_go_otel_exporters_prometheus", build_file_proto_mode = "disable_global", importpath = "go.opentelemetry.io/otel/exporters/prometheus", - sum = "h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w=", - version = "v0.44.0", + sum = "h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o=", + version = "v0.44.1-0.20231201153405-6027c1ae76f2", ) go_repository( name = "io_opentelemetry_go_otel_internal_metric", diff --git a/docker-images/opentelemetry-collector/builder.template.yaml b/docker-images/opentelemetry-collector/builder.template.yaml index eebdfde59b2..c907f30e990 100644 --- a/docker-images/opentelemetry-collector/builder.template.yaml +++ b/docker-images/opentelemetry-collector/builder.template.yaml @@ -11,8 +11,10 @@ exporters: - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v$OTEL_COLLECTOR_VERSION # Contrib exporters - https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v$OTEL_COLLECTOR_VERSION" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v$OTEL_COLLECTOR_VERSION" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v$OTEL_COLLECTOR_VERSION" + # jaegerexporter was removed after v0.85.0 - we try to include it for now by pinning the version. + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.85.0" receivers: # OpenTelemetry receivers - https://go.opentelemetry.io/collector/receiver diff --git a/go.mod b/go.mod index 380a064e928..8f97f31d47b 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/fatih/color v1.15.0 github.com/felixge/fgprof v0.9.3 github.com/felixge/httpsnoop v1.0.4 - github.com/fsnotify/fsnotify v1.6.0 + github.com/fsnotify/fsnotify v1.7.0 github.com/gen2brain/beeep v0.0.0-20210529141713-5586760f0cc1 github.com/getsentry/sentry-go v0.25.0 github.com/ghodss/yaml v1.0.0 @@ -194,13 +194,13 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeonx/timeago v1.0.0-rc4 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9 - go.opentelemetry.io/collector v0.81.0 // indirect - go.opentelemetry.io/collector/component v0.81.0 - go.opentelemetry.io/collector/exporter v0.81.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.81.0 - go.opentelemetry.io/collector/receiver v0.81.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 + go.opentelemetry.io/collector v0.92.0 // indirect + go.opentelemetry.io/collector/component v0.92.0 + go.opentelemetry.io/collector/exporter v0.92.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.92.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.92.0 + go.opentelemetry.io/collector/receiver v0.92.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.92.0 go.opentelemetry.io/contrib/detectors/gcp v1.21.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 @@ -282,10 +282,10 @@ require ( github.com/sourcegraph/sourcegraph/lib/managedservicesplatform v0.0.0-00010101000000-000000000000 github.com/vektah/gqlparser/v2 v2.4.5 github.com/vvakame/gcplogurl v0.2.0 - go.opentelemetry.io/collector/config/confighttp v0.81.0 - go.opentelemetry.io/collector/config/configtelemetry v0.81.0 - go.opentelemetry.io/collector/config/configtls v0.81.0 - go.opentelemetry.io/otel/exporters/prometheus v0.44.0 + go.opentelemetry.io/collector/config/confighttp v0.92.0 + go.opentelemetry.io/collector/config/configtelemetry v0.92.0 + go.opentelemetry.io/collector/config/configtls v0.92.0 + go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 gorm.io/gorm v1.25.5 ) @@ -356,13 +356,13 @@ require ( github.com/onsi/ginkgo/v2 v2.9.7 // indirect github.com/onsi/gomega v1.27.8 // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect github.com/prometheus/prometheus v0.40.5 // indirect github.com/rickb777/date v1.14.3 // indirect github.com/rickb777/plural v1.2.2 // indirect - github.com/shirou/gopsutil/v3 v3.23.5 // indirect + github.com/shirou/gopsutil/v3 v3.23.12 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/skeema/knownhosts v1.1.1 // indirect github.com/smartystreets/assertions v1.13.0 // indirect @@ -371,18 +371,18 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect github.com/zenazn/goji v1.0.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.81.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.81.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect - go.opentelemetry.io/collector/config/internal v0.81.0 // indirect - go.opentelemetry.io/collector/confmap v0.81.0 // indirect - go.opentelemetry.io/collector/consumer v0.81.0 // indirect - go.opentelemetry.io/collector/extension v0.81.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.81.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect - go.opentelemetry.io/collector/processor v0.81.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.92.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.92.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.92.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.92.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.92.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.92.0 // indirect + go.opentelemetry.io/collector/config/internal v0.92.0 // indirect + go.opentelemetry.io/collector/confmap v0.92.0 // indirect + go.opentelemetry.io/collector/consumer v0.92.0 // indirect + go.opentelemetry.io/collector/extension v0.92.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.92.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.1 // indirect go.uber.org/goleak v1.3.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect @@ -514,7 +514,7 @@ require ( github.com/k3a/html2text v1.1.0 github.com/karlseguin/typed v1.1.8 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.4 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/kr/pretty v0.3.1 @@ -534,7 +534,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/mostynb/go-grpc-compression v1.2.0 // indirect + github.com/mostynb/go-grpc-compression v1.2.2 // indirect github.com/mschoch/smat v0.2.0 // indirect github.com/muesli/reflow v0.3.0 // indirect github.com/muesli/termenv v0.12.0 // indirect @@ -558,7 +558,7 @@ require ( github.com/pseudomuto/protokit v0.2.1 // indirect github.com/rivo/uniseg v0.4.3 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - github.com/rs/cors v1.9.0 // indirect + github.com/rs/cors v1.10.1 // indirect github.com/rs/xid v1.5.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 @@ -567,7 +567,7 @@ require ( github.com/sourcegraph/mountinfo v0.0.0-20231018142932-e00da332dac5 github.com/sourcegraph/sourcegraph/monitoring v0.0.0-20230124144931-b2d81b1accb6 github.com/sourcegraph/zoekt v0.0.0-20240110094557-7487a0d53131 - github.com/spf13/cobra v1.7.0 // indirect + github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect @@ -587,7 +587,7 @@ require ( go.bobheadxi.dev/streamline v1.2.2 go.mongodb.org/mongo-driver v1.11.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 // indirect + go.opentelemetry.io/collector/pdata v1.0.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/mod v0.14.0 diff --git a/go.sum b/go.sum index 216b8aa9ec7..33c9eb108e1 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUork github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= 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/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fullstorydev/grpcui v1.3.1 h1:lVXozTNkJJouBL+wpmvxMnltiwYp8mgyd0TRs93i6Rw= github.com/fullstorydev/grpcui v1.3.1/go.mod h1:Jdfm5xPJVpEaqQi2HkqiqJ8lHIa0g3hwtaKNKXUsYwA= github.com/fullstorydev/grpcurl v1.8.6 h1:WylAwnPauJIofYSHqqMTC1eEfUIzqzevXyogBxnQquo= @@ -1212,8 +1212,8 @@ github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= @@ -1372,8 +1372,8 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -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/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= +github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY= github.com/mroth/weightedrand/v2 v2.0.1 h1:zrEVDIaau/E4QLOKu02kpg8T8myweFlMGikIgbIdrRA= @@ -1459,8 +1459,8 @@ github.com/peterbourgon/ff/v3 v3.3.2/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyX github.com/peterhellberg/link v1.1.0 h1:s2+RH8EGuI/mI4QwrWGSYQCRz7uNgip9BaM04HKu5kc= github.com/peterhellberg/link v1.1.0/go.mod h1:gtSlOT4jmkY8P47hbTc8PTgiDDWpdPbFYl75keYyBB8= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= @@ -1556,8 +1556,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= -github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= -github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -1590,8 +1590,8 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= -github.com/shirou/gopsutil/v3 v3.23.5 h1:5SgDCeQ0KW0S4N0znjeM/eFHXXOKyv2dVNgRq/c9P6Y= -github.com/shirou/gopsutil/v3 v3.23.5/go.mod h1:Ng3Maa27Q2KARVJ0SPZF5NdrQSC3XHKP8IIWrHgMeLY= +github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= +github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= @@ -1681,8 +1681,8 @@ github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v0.0.0-20170901151539-12bd96e66386/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1710,7 +1710,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= @@ -1733,8 +1732,8 @@ github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160 h1:NSWpaDaurcAJY7PkL8Xt0 github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= github.com/tj/go-naturaldate v1.3.0 h1:OgJIPkR/Jk4bFMBLbxZ8w+QUxwjqSvzd9x+yXocY4RI= github.com/tj/go-naturaldate v1.3.0/go.mod h1:rpUbjivDKiS1BlfMGc2qUKNZ/yxgthOfmytQs8d8hKk= -github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= -github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 h1:nrZ3ySNYwJbSpD6ce9duiP+QkD3JuLCcWkdaehUS/3Y= github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFyPdL66DjUD96XmzVL3ZntbzcflLnznH0fr99w5VqE= @@ -1856,54 +1855,54 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= 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 v0.81.0 h1:pF+sB8xNXlg/W0a0QTLz4mUWyool1a9toVj8LmLoFqg= -go.opentelemetry.io/collector v0.81.0/go.mod h1:thuOTBMusXwcTPTwLbs3zwwCOLaaQX2g+Hjf8OObc/w= -go.opentelemetry.io/collector/component v0.81.0 h1:AKsl6bss/SRrW248GFpmGiiI/4kdemW92Ai/X82CCqY= -go.opentelemetry.io/collector/component v0.81.0/go.mod h1:+m6/yPiJ7O7Oc/OLfmgUB2mrY1xoUqRj4BsoOtIVpGs= -go.opentelemetry.io/collector/config/configauth v0.81.0 h1:NIiJuIGOdblN0EIJv64R2mvGhthcYfWuvyCnjk8HRN4= -go.opentelemetry.io/collector/config/configauth v0.81.0/go.mod h1:2KscbmU+8fIzwiSU9Kku0Tf4b4A1plqFIJXR1DWSaTw= -go.opentelemetry.io/collector/config/configcompression v0.81.0 h1:Q725pvVH7tR6BP3WK7Ro3pbqMeQdZEV3KeFVHchBxCc= -go.opentelemetry.io/collector/config/configcompression v0.81.0/go.mod h1:xhHm1sEH7BTECAJo1xn64NMxeIvZGKdVGdSKUUc+YuM= -go.opentelemetry.io/collector/config/configgrpc v0.81.0 h1:Q2xEE2SGbg79j3TdHT+781eUu/2uUIyrHVJAG9bLpVk= -go.opentelemetry.io/collector/config/configgrpc v0.81.0/go.mod h1:Frq/l2Ttbvm7cFH3hkxLdhl5TCNHcH6rnkpmi8U2kLY= -go.opentelemetry.io/collector/config/confighttp v0.81.0 h1:vIdiepUT7P/WtJRdfh8mjzvSqJRVF8/vl9GWtUNQlHQ= -go.opentelemetry.io/collector/config/confighttp v0.81.0/go.mod h1:I54THsffkpv//O7bUHw+0bXxjYdvyL6IHg5ksgYez8I= -go.opentelemetry.io/collector/config/confignet v0.81.0 h1:Eu8m3eX8GaGhOUc//YXvV4i3cEivxUSxkLnV1U9ydhg= -go.opentelemetry.io/collector/config/confignet v0.81.0/go.mod h1:unOg7BZvpt6T5xsf+LyeOQvUhD8ld/2AbfOsmUZ/bPM= -go.opentelemetry.io/collector/config/configopaque v0.81.0 h1:MkCAGh0WydRWydETB9FLnuCj9hDPDiz2g4Wxnl53I0w= -go.opentelemetry.io/collector/config/configopaque v0.81.0/go.mod h1:pM1oy6gasukw3H6jAvc9Q9OtFaaY2IbfeuwCPAjOgXc= -go.opentelemetry.io/collector/config/configtelemetry v0.81.0 h1:j3dhWbAcrfL1n0RmShRJf99X/xIMoPfEShN/5Z8bY0k= -go.opentelemetry.io/collector/config/configtelemetry v0.81.0/go.mod h1:KEYQRiYJdx38iZkvcLKBZWH9fK4NeafxBwGRrRKMgyA= -go.opentelemetry.io/collector/config/configtls v0.81.0 h1:2vt+yOZUvGq5ADqFAxL5ONm1ACuGXDSs87AWT54Ez4M= -go.opentelemetry.io/collector/config/configtls v0.81.0/go.mod h1:HMHTYBMMgqBpTvnNAhQYmjO7XuoBMe2T4qRHcKluB4Q= -go.opentelemetry.io/collector/config/internal v0.81.0 h1:wRV2PBnJygdmKpIdt/xfG7zdQvXvHz9L+z8MhGsOji4= -go.opentelemetry.io/collector/config/internal v0.81.0/go.mod h1:RKcLV1gQxhgwx+6rlPYsvGMq1RZNne3UeOUZkHxJnIg= -go.opentelemetry.io/collector/confmap v0.81.0 h1:AqweoBGdF3jGM2/KgP5GS6bmN+1aVrEiCy4nPf7IBE4= -go.opentelemetry.io/collector/confmap v0.81.0/go.mod h1:iCTnTqGgZZJumhJxpY7rrJz9UQ/0zjPmsJz2Z7Tp4RY= -go.opentelemetry.io/collector/consumer v0.81.0 h1:8R2iCrSzD7T0RtC2Wh4GXxDiqla2vNhDokGW6Bcrfas= -go.opentelemetry.io/collector/consumer v0.81.0/go.mod h1:jS7+gAKdOx3lD3SnaBztBjUVpUYL3ee7fpoqI4p/gT8= -go.opentelemetry.io/collector/exporter v0.81.0 h1:GLhB8WGrBx+zZSB1HIOx2ivFUMahGtAVO2CC5xbCUHQ= -go.opentelemetry.io/collector/exporter v0.81.0/go.mod h1:Di4RTzI8uRooVNATIeApNUgmGdNt8XiikUTQLabmZaA= -go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0 h1:Ri5pj0slm+FUbbG81UIhQaQ992z2+PcT2++4JI32XGI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0/go.mod h1:u19TJEy/n35jjU/ie2YOlAL4K1s9rvRKSNaq9JDlBF8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.81.0 h1:KSE7wjy1J0I0izLTodTW4axRmJplpQgCRqYFbAzufZo= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.81.0/go.mod h1:x/G0eEHSDvHPSoOzaqY8v6uSfwnTuVmKudAEYqAXJJ4= -go.opentelemetry.io/collector/extension v0.81.0 h1:Ak7AzZzxTFJxGyVbEklsGzqHyOHW5USiifJilCcRyTU= -go.opentelemetry.io/collector/extension v0.81.0/go.mod h1:DU2bX8qulS5+OCJZGfvqIwIT/q3sFnEjI2HjJ2LDI/s= -go.opentelemetry.io/collector/extension/auth v0.81.0 h1:UzVQSG9naJh1hX7hh+HVcvB3n+rpCJXX2BBdUoL/Ybo= -go.opentelemetry.io/collector/extension/auth v0.81.0/go.mod h1:PaBFcFrzXV+UgM4VZKp6Kn1IiRC/MbEYWxTfIalcIwk= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 h1:tiTUG9X/gEDN1oDYQOBVUFYQfhUG2CvgW9VhBc2uk1U= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0013/go.mod h1:x09G/4KjEcDKNuWCjC5ZtnuDE0XEqiRwI+yrHSVjIy8= -go.opentelemetry.io/collector/processor v0.81.0 h1:ypyNV5R0bnN3XGMAsH/q5eNARF5vXtFgSOK9rBWzsLc= -go.opentelemetry.io/collector/processor v0.81.0/go.mod h1:ZDwO3DVg1VUSA92g0r/o0jYk+T7r9uxgZZ3LABJbC34= -go.opentelemetry.io/collector/receiver v0.81.0 h1:0c+YtIV7fmd9ev+zmwS9qjx5ASi8cw+gSypu4I7Gugc= -go.opentelemetry.io/collector/receiver v0.81.0/go.mod h1:q80JkMxVLnk0vWxoTRY2J7F4Qx9069Yy5yxDbZ4JVwk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 h1:ewVbfATnAeQkwFK3r0dpFKCXcTb8HJKX4AixUioRt+c= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0/go.mod h1:LGuSMVdOq5Zq+CEHF9YBHMaOIUZrzqW7DQGqo9g0dJA= -go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= -go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector v0.92.0 h1:XiC0ptaT1EmOkK2RI0gt3n2tkzLAkNQGf0E7hrGdyeA= +go.opentelemetry.io/collector v0.92.0/go.mod h1:wbksjM63DTKA1BbdUVS7gAFzAngCZTWb46RBpKdtsPw= +go.opentelemetry.io/collector/component v0.92.0 h1:/tRgPT1hr4KNB8ABHa0oJsjJFRZ5oiCIYHcTpZGwm9s= +go.opentelemetry.io/collector/component v0.92.0/go.mod h1:C2JwPTjauu36UCAzwX71/glNnOc5BR18p8FVccCFsqc= +go.opentelemetry.io/collector/config/configauth v0.92.0 h1:m4O5QLerdsuWYEV8bZGZWDHnM8TtHkr52q9r6hAkasw= +go.opentelemetry.io/collector/config/configauth v0.92.0/go.mod h1:P3tCzSFgxxmBdELVA/h05fGjyYXOr6mCDG4995yPzqo= +go.opentelemetry.io/collector/config/configcompression v0.92.0 h1:LtHx4ZkW3BMxa4CfQGMOE7+ZhXvd4W10Pxa91Hr8IL0= +go.opentelemetry.io/collector/config/configcompression v0.92.0/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.92.0 h1:vXUlGdAfg8ZvzkCyYx5+eagbzj2cQK306C3tZpWb7hY= +go.opentelemetry.io/collector/config/configgrpc v0.92.0/go.mod h1:MOUXJ4rVhsYQ+1nv8AxuwuFNWeCWrWRnjo2aP+5zRh0= +go.opentelemetry.io/collector/config/confighttp v0.92.0 h1:O1iAgwVJBnHgLqzHMBBbI0pa0nBZHalTQrFQGwiEuiE= +go.opentelemetry.io/collector/config/confighttp v0.92.0/go.mod h1:ZnZz2+bIHk4PRnJMvSPjQWdTDkfoBb4cH2R2gQVf1V4= +go.opentelemetry.io/collector/config/confignet v0.92.0 h1:4B4Ir68P+ew3nVz2/9lBN+KGXtkETPqErM8nQCg8tFo= +go.opentelemetry.io/collector/config/confignet v0.92.0/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.92.0 h1:YvUSVa3Vxt2gSl5SwEohtn9HG0+8bO4zuAOCVICBIVU= +go.opentelemetry.io/collector/config/configopaque v0.92.0/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configretry v0.92.0 h1:3WUabmCRIBHSkOLGCHGieUGchlHkBw3Fa4Cj9Do5Xdw= +go.opentelemetry.io/collector/config/configretry v0.92.0/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.92.0 h1:iCfxJ2DhWVOAHpGgkWUZRfUvUPyWGhpVRCqjPQ2D87Y= +go.opentelemetry.io/collector/config/configtelemetry v0.92.0/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.92.0 h1:jJHZvRp8CZ76IYbhHdGgGosBMQ/EShQAc0NlE3/tlHk= +go.opentelemetry.io/collector/config/configtls v0.92.0/go.mod h1:rL9BH5Hyrkni4t+QOx/opuwD0CHq/ZIFTsh6QLLsbmA= +go.opentelemetry.io/collector/config/internal v0.92.0 h1:1GCj5swGzCZQphHqzt1OSsA/vOmAgFLoydY8bBqAhs4= +go.opentelemetry.io/collector/config/internal v0.92.0/go.mod h1:rPjglfSd4K/kNLfH7TJO8AsstHGMmWTdntOqH7WiFLg= +go.opentelemetry.io/collector/confmap v0.92.0 h1:xz20zNIvF9ZA1eWE+MZmZunmdXPIP/fr33ZvU0QUSxg= +go.opentelemetry.io/collector/confmap v0.92.0/go.mod h1:CmqTszB2uwiJ9ieEqISdecuoVuyt3jMnJ/9kD53GYHs= +go.opentelemetry.io/collector/consumer v0.92.0 h1:twa8T0iR9KVglvRbwZ5OPKLXPCC2DO6gVhrgDZ47MPE= +go.opentelemetry.io/collector/consumer v0.92.0/go.mod h1:fBZqP7bou3I7pDhWjleBuzdaLfQgJBc92wPJVOcKaGU= +go.opentelemetry.io/collector/exporter v0.92.0 h1:z6u+/hswJUuZbuPYIF2gXMZsqjIDd/tJO60XjLM850U= +go.opentelemetry.io/collector/exporter v0.92.0/go.mod h1:54ODYn1weY/Wr0bdxESj4P1fgyX+zaUsnJJnafORqIY= +go.opentelemetry.io/collector/exporter/otlpexporter v0.92.0 h1:t1Bw82ziGkilLdGFU7r7EeXrK+sH5V/iwafEeFD/kik= +go.opentelemetry.io/collector/exporter/otlpexporter v0.92.0/go.mod h1:zmZiMKuPrhPqcILsZbXg28V8biywyjzse5m3jjN6AB0= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.92.0 h1:dWlGND+W4j7yBX6j3um+Co9sfjq4aVitMO1SSUQkjrA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.92.0/go.mod h1:9G/ehcPHLzZbQWp3GndZ6oQsMZEemZs3UYOsS6y2VnQ= +go.opentelemetry.io/collector/extension v0.92.0 h1:zaehgW+LXCMNEb1d6Af/VHWphh5ZwX9aZl+NuQLGhpQ= +go.opentelemetry.io/collector/extension v0.92.0/go.mod h1:5EYwiaGU6deSY8YWqT5gvlnD850yJXP3NqFRKVVbYLs= +go.opentelemetry.io/collector/extension/auth v0.92.0 h1:FlCObeiYXsVStltFivg+gD5PSFUM6dXHigkgkUMitv0= +go.opentelemetry.io/collector/extension/auth v0.92.0/go.mod h1:fqCblNQV8Iz5w7Nrp1B865EJzKlVWS0aRgrr/c2HDDg= +go.opentelemetry.io/collector/featuregate v1.0.1 h1:ok//hLSXttBbyu4sSV1pTx1nKdr5udSmrWy5sFMIIbM= +go.opentelemetry.io/collector/featuregate v1.0.1/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.1 h1:dGX2h7maA6zHbl5D3AsMnF1c3Nn+3EUftbVCLzeyNvA= +go.opentelemetry.io/collector/pdata v1.0.1/go.mod h1:jutXeu0QOXYY8wcZ/hege+YAnSBP3+jpTqYU1+JTI5Y= +go.opentelemetry.io/collector/receiver v0.92.0 h1:TRz4ufr5bFEszpAWgYVEx/b7VPZzEcECsyMzztf5PsQ= +go.opentelemetry.io/collector/receiver v0.92.0/go.mod h1:bYAAYbMuUVj3wx7ave2iyyJ+aGUpACliYOQ5xI92I7k= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.92.0 h1:77oFMYYJfRu4yqlRkExMHDieg9gPv38UsMtK/0cu5kU= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.92.0/go.mod h1:eZIrA6CY6xcm9uu3hmycS+L9kmBzyXE66Ci8FwkJpmI= +go.opentelemetry.io/contrib/config v0.1.1 h1:lIUTrMWkfDE0GvzBLhwv6ATDB1vntrnTsRvUMkZKnfQ= +go.opentelemetry.io/contrib/config v0.1.1/go.mod h1:rDrK4+PS6Cs+WIphU/GO5Sk4TGV36lEQqk/Z1vZkaLI= go.opentelemetry.io/contrib/detectors/gcp v1.21.1 h1:VLAa8mb2eMu2Iq9pnVhece0Yla2mIq1yKYLUoZ/ifJs= go.opentelemetry.io/contrib/detectors/gcp v1.21.1/go.mod h1:yL1WBcIgLFgqHhuMqmxp6ddaXoNFPeUgk6ATnF4wBhI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= @@ -1928,8 +1927,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqhe go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= -go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 h1:TnhkxGJ5qPHAMIMI4r+HPT/BbpoHxqn4xONJrok054o= +go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= @@ -2241,13 +2240,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= diff --git a/internal/grpc/defaults/defaults.go b/internal/grpc/defaults/defaults.go index b31899fbb8d..0866b50e571 100644 --- a/internal/grpc/defaults/defaults.go +++ b/internal/grpc/defaults/defaults.go @@ -76,12 +76,12 @@ func defaultDialOptions(logger log.Logger, creds credentials.TransportCredential out := []grpc.DialOption{ grpc.WithTransportCredentials(creds), - grpc.WithStatsHandler(otelgrpc.NewClientHandler()), grpc.WithChainStreamInterceptor( propagator.StreamClientPropagator(actor.ActorPropagator{}), propagator.StreamClientPropagator(policy.ShouldTracePropagator{}), propagator.StreamClientPropagator(requestclient.Propagator{}), propagator.StreamClientPropagator(requestinteraction.Propagator{}), + otelgrpc.StreamClientInterceptor(), //lint:ignore SA1019 the advertised replacement doesn't seem to be a drop-in replacement, use deprecated mechanism for now retry.StreamClientInterceptor(logger), metrics.StreamClientInterceptor(), messagesize.StreamClientInterceptor, @@ -94,6 +94,7 @@ func defaultDialOptions(logger log.Logger, creds credentials.TransportCredential propagator.UnaryClientPropagator(policy.ShouldTracePropagator{}), propagator.UnaryClientPropagator(requestclient.Propagator{}), propagator.UnaryClientPropagator(requestinteraction.Propagator{}), + otelgrpc.UnaryClientInterceptor(), //lint:ignore SA1019 the advertised replacement doesn't seem to be a drop-in replacement, use deprecated mechanism for now retry.UnaryClientInterceptor(logger), metrics.UnaryClientInterceptor(), messagesize.UnaryClientInterceptor, @@ -170,7 +171,6 @@ func buildServerOptions(logger log.Logger, opts serverOptions) []grpc.ServerOpti } out := []grpc.ServerOption{ - grpc.StatsHandler(otelgrpc.NewServerHandler(otelOpts...)), grpc.ChainStreamInterceptor( internalgrpc.NewStreamPanicCatcher(logger), internalerrs.LoggingStreamServerInterceptor(logger), @@ -180,6 +180,7 @@ func buildServerOptions(logger log.Logger, opts serverOptions) []grpc.ServerOpti propagator.StreamServerPropagator(requestinteraction.Propagator{}), propagator.StreamServerPropagator(actor.ActorPropagator{}), propagator.StreamServerPropagator(policy.ShouldTracePropagator{}), + otelgrpc.StreamServerInterceptor(otelOpts...), //lint:ignore SA1019 the advertised replacement doesn't seem to be a drop-in replacement, use deprecated mechanism for now contextconv.StreamServerInterceptor, ), grpc.ChainUnaryInterceptor( @@ -191,6 +192,7 @@ func buildServerOptions(logger log.Logger, opts serverOptions) []grpc.ServerOpti propagator.UnaryServerPropagator(requestinteraction.Propagator{}), propagator.UnaryServerPropagator(actor.ActorPropagator{}), propagator.UnaryServerPropagator(policy.ShouldTracePropagator{}), + otelgrpc.UnaryServerInterceptor(otelOpts...), //lint:ignore SA1019 the advertised replacement doesn't seem to be a drop-in replacement, use deprecated mechanism for now contextconv.UnaryServerInterceptor, ), grpc.MaxRecvMsgSize(defaultGRPCMessageReceiveSizeBytes), diff --git a/wolfi-packages/opentelemetry-collector.yaml b/wolfi-packages/opentelemetry-collector.yaml index c03618ec761..491b749393d 100644 --- a/wolfi-packages/opentelemetry-collector.yaml +++ b/wolfi-packages/opentelemetry-collector.yaml @@ -1,6 +1,6 @@ package: name: opentelemetry-collector - version: 0.81.0 # Keep in sync with version in go.mod + version: 0.92.0 # Keep in sync with go.opentelemetry.io/collector version in go.mod epoch: 3 description: "Vendor-agnostic implementation on how to receive, process and export telemetry data" target-architecture: diff --git a/wolfi-packages/opentelemetry-collector/builder.template.yaml b/wolfi-packages/opentelemetry-collector/builder.template.yaml index d45b86ace05..c907f30e990 100644 --- a/wolfi-packages/opentelemetry-collector/builder.template.yaml +++ b/wolfi-packages/opentelemetry-collector/builder.template.yaml @@ -11,9 +11,10 @@ exporters: - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v$OTEL_COLLECTOR_VERSION # Contrib exporters - https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v$OTEL_COLLECTOR_VERSION" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v$OTEL_COLLECTOR_VERSION" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v$OTEL_COLLECTOR_VERSION" + # jaegerexporter was removed after v0.85.0 - we try to include it for now by pinning the version. + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.85.0" receivers: # OpenTelemetry receivers - https://go.opentelemetry.io/collector/receiver @@ -22,6 +23,7 @@ receivers: # Contrib receivers - https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v$OTEL_COLLECTOR_VERSION" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v$OTEL_COLLECTOR_VERSION" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v$OTEL_COLLECTOR_VERSION" extensions: # OpenTelemetry extensions - https://go.opentelemetry.io/collector/extension @@ -31,7 +33,10 @@ extensions: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v$OTEL_COLLECTOR_VERSION processors: + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v$OTEL_COLLECTOR_VERSION # Contrib extensions - https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v$OTEL_COLLECTOR_VERSION - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v$OTEL_COLLECTOR_VERSION - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v$OTEL_COLLECTOR_VERSION - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v$OTEL_COLLECTOR_VERSION + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v$OTEL_COLLECTOR_VERSION