diff --git a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json index 5c51c70bd50d5..c1a1f0a71b07e 100644 --- a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json +++ b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json @@ -14,7 +14,7 @@ "Fields": [ { "Name": "grpc", - "Type": "*configgrpc.GRPCServerSettings", + "Type": "*configgrpc.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "", @@ -261,7 +261,7 @@ }, { "Name": "http", - "Type": "*confighttp.HTTPServerConfig", + "Type": "*confighttp.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "", diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index df5367a2ba62c..b280f8bcd0ea5 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -10,10 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 golang.org/x/mod v0.14.0 golang.org/x/text v0.14.0 @@ -173,8 +173,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect ) require ( @@ -621,35 +621,35 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index dc0b2c1b34336..e24e4f1883a6f 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1569,76 +1569,76 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f h1:wQcpS+Mm42oaYDZ2YqqNc/bmxzeHUD2KzL7Vgx7pDj0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d h1:eONwZYONNf2uu7zSbv8PurEP+f+Cf/fWPx3gEw5zOVM= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod index 346c22c9aa005..66e9342939b53 100644 --- a/cmd/githubgen/go.mod +++ b/cmd/githubgen/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/google/go-github/v58 v58.0.0 - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d gopkg.in/yaml.v3 v3.0.1 ) @@ -13,7 +13,6 @@ require ( github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum index 243e460c88736..e91057f20c22a 100644 --- a/cmd/githubgen/go.sum +++ b/cmd/githubgen/go.sum @@ -1,4 +1,3 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -12,9 +11,6 @@ github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPgh github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= @@ -22,15 +18,14 @@ github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 961e447c50822..87943120644c8 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -6,11 +6,11 @@ go 1.20 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index ea0530cbfca5f..b1a5d052d5422 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod index ff63d0d881d1d..3ac8404e34903 100644 --- a/cmd/opampsupervisor/go.mod +++ b/cmd/opampsupervisor/go.mod @@ -11,8 +11,8 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -27,7 +27,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum index 2813d1132bcd6..ae138c0a2e08d 100644 --- a/cmd/opampsupervisor/go.sum +++ b/cmd/opampsupervisor/go.sum @@ -8,10 +8,12 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP1XFUxVI5w= github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c= github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA= github.com/knadh/koanf/providers/rawbytes v0.1.0 h1:dpzgu2KO6uf6oCb4aP05KDmKmAmI51k5pe8RYKQ0qME= @@ -36,12 +38,15 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/cmd/opampsupervisor/specification/README.md b/cmd/opampsupervisor/specification/README.md index c842a86bef32e..0fef754e446a6 100644 --- a/cmd/opampsupervisor/specification/README.md +++ b/cmd/opampsupervisor/specification/README.md @@ -411,7 +411,7 @@ extensions: opamp: # OpAMP server URL. Supports WS or plain http transport, # based on the scheme of the URL (ws,wss,http,https). - # Any other settings defined in HTTPClientConfig, squashed. This + # Any other settings defined in ClientConfig, squashed. This # includes ability to specify an "auth" setting that refers # to an extension that implements the Authentication interface. endpoint: diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 3f79cf1a0ca58..c30b5ebec243f 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -6,8 +6,8 @@ dist: otelcol_version: 0.93.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.93.0 @@ -44,9 +44,9 @@ extensions: import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.93.0 @@ -94,8 +94,8 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor v0.93.0 @@ -120,7 +120,7 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.93.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.93.0 @@ -210,7 +210,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.93.0 diff --git a/cmd/otelcontribcol/exporters_test.go b/cmd/otelcontribcol/exporters_test.go index 8d7eca7fd568f..4073b8e1b1687 100644 --- a/cmd/otelcontribcol/exporters_test.go +++ b/cmd/otelcontribcol/exporters_test.go @@ -127,7 +127,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "opencensus", getConfigFn: func() component.Config { cfg := expFactories["opencensus"].CreateDefaultConfig().(*opencensusexporter.Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, } // disable queue/retry to validate passing the test data synchronously @@ -141,7 +141,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "opensearch", getConfigFn: func() component.Config { cfg := expFactories["opensearch"].CreateDefaultConfig().(*opensearchexporter.Config) - cfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + cfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "http://" + endpoint, } return cfg @@ -152,7 +152,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "otlp", getConfigFn: func() component.Config { cfg := expFactories["otlp"].CreateDefaultConfig().(*otlpexporter.Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, } // disable queue/retry to validate passing the test data synchronously @@ -266,7 +266,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "alertmanager", getConfigFn: func() component.Config { cfg := expFactories["alertmanager"].CreateDefaultConfig().(*alertmanagerexporter.Config) - cfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + cfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "http://" + endpoint, } cfg.GeneratorURL = "opentelemetry-collector" diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 12f9ad8e66d16..d520d6c69398f 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -196,27 +196,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d golang.org/x/sys v0.16.0 ) @@ -651,19 +651,19 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 97922f3b34c3b..a02943547c270 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1568,74 +1568,74 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index 83c7453eb1a81..b794f6896bfc7 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -6,16 +6,16 @@ dist: otelcol_version: 0.93.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.93.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.93.0 @@ -27,13 +27,13 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.93.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 7f47f2d630b8d..3f2b7f70ef611 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -32,21 +32,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d golang.org/x/sys v0.16.0 ) @@ -213,24 +213,24 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect go.etcd.io/bbolt v1.3.8 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index f55f31211ae70..4d7e70ecef3fa 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -626,72 +626,72 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod index d5f5475324260..58e12455b7a7d 100644 --- a/cmd/telemetrygen/go.mod +++ b/cmd/telemetrygen/go.mod @@ -7,9 +7,9 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 @@ -44,8 +44,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum index a5cbf19a3de49..fbf5514e8ab79 100644 --- a/cmd/telemetrygen/go.sum +++ b/cmd/telemetrygen/go.sum @@ -91,16 +91,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= diff --git a/cmd/telemetrygen/internal/e2etest/go.mod b/cmd/telemetrygen/internal/e2etest/go.mod index d1028e8767b61..c8d53565a8869 100644 --- a/cmd/telemetrygen/internal/e2etest/go.mod +++ b/cmd/telemetrygen/internal/e2etest/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d ) require ( @@ -46,21 +46,21 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/cmd/telemetrygen/internal/e2etest/go.sum b/cmd/telemetrygen/internal/e2etest/go.sum index ebaff1a024182..994b48b25ab76 100644 --- a/cmd/telemetrygen/internal/e2etest/go.sum +++ b/cmd/telemetrygen/internal/e2etest/go.sum @@ -117,44 +117,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 2dc9d4b43f6c2..9cde560cc8b10 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -32,7 +32,6 @@ require ( github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index 6f53fa53cfe4e..658fad195321f 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -34,7 +34,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGz github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= @@ -44,9 +43,8 @@ github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPgh github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= @@ -55,17 +53,16 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod index 9e890c6b9c89d..f7305affd3879 100644 --- a/connector/countconnector/go.mod +++ b/connector/countconnector/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index 9850ad3cf6376..30c140029e57a 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -71,20 +71,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index c9330ff23974c..230feb349f7ec 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -11,17 +11,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -138,23 +138,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index c1eff0990280b..54ce6489c39be 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -503,64 +503,64 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index be97ea4ffd331..a1692bf75cc7f 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index 8246053a4f99c..85529cc9cc16f 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -58,22 +58,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/failoverconnector/go.mod b/connector/failoverconnector/go.mod index 7c65a06f71d2e..addd168b607a3 100644 --- a/connector/failoverconnector/go.mod +++ b/connector/failoverconnector/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/failoverconnector/go.sum b/connector/failoverconnector/go.sum index dc2189c33aeac..4d864aa96d8ed 100644 --- a/connector/failoverconnector/go.sum +++ b/connector/failoverconnector/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index 975da42c0e456..eb350e10a19ba 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index 9eb3c0464825d..e8837f6b0e6cb 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -71,20 +71,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/servicegraphconnector/go.mod b/connector/servicegraphconnector/go.mod index 779720c674b31..187785a8ed3f1 100644 --- a/connector/servicegraphconnector/go.mod +++ b/connector/servicegraphconnector/go.mod @@ -4,17 +4,17 @@ go 1.18 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -61,10 +61,10 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index 97ce507e99967..22cc886bc9160 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -133,39 +133,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index 67b2154da334d..e0d560649c839 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index 6617ab76a4752..30e0c6a25f507 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -64,22 +64,22 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/alertmanagerexporter/alertmanager_exporter.go b/exporter/alertmanagerexporter/alertmanager_exporter.go index 663ebd4b45d46..b1adb67cc5493 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter.go @@ -181,7 +181,7 @@ func (s *alertmanagerExporter) pushTraces(ctx context.Context, td ptrace.Traces) func (s *alertmanagerExporter) start(_ context.Context, host component.Host) error { - client, err := s.config.HTTPClientConfig.ToClient(host, s.settings) + client, err := s.config.ClientConfig.ToClient(host, s.settings) if err != nil { return fmt.Errorf("failed to create HTTP Client: %w", err) } @@ -203,7 +203,7 @@ func newAlertManagerExporter(cfg *Config, set component.TelemetrySettings) *aler config: cfg, settings: set, tracesMarshaler: &ptrace.JSONMarshaler{}, - endpoint: fmt.Sprintf("%s/api/v1/alerts", cfg.HTTPClientConfig.Endpoint), + endpoint: fmt.Sprintf("%s/api/v1/alerts", cfg.ClientConfig.Endpoint), generatorURL: cfg.GeneratorURL, defaultSeverity: cfg.DefaultSeverity, severityAttribute: cfg.SeverityAttribute, diff --git a/exporter/alertmanagerexporter/alertmanager_exporter_test.go b/exporter/alertmanagerexporter/alertmanager_exporter_test.go index d177d3d2f5178..438c44824fe78 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter_test.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter_test.go @@ -333,7 +333,7 @@ func TestAlertManagerPostAlert(t *testing.T) { } } -func TestHTTPClientConfig(t *testing.T) { +func TestClientConfig(t *testing.T) { endpoint := "http://" + testutil.GetAvailableLocalAddress(t) fmt.Println(endpoint) tests := []struct { @@ -345,7 +345,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "UseSecure", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -356,7 +356,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "Headers", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -368,7 +368,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "CaCert", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -381,7 +381,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "CertPemFileError", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/alertmanagerexporter/config.go b/exporter/alertmanagerexporter/config.go index 37af19b43d7a8..3948dc3601378 100644 --- a/exporter/alertmanagerexporter/config.go +++ b/exporter/alertmanagerexporter/config.go @@ -18,10 +18,10 @@ type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` BackoffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - GeneratorURL string `mapstructure:"generator_url"` - DefaultSeverity string `mapstructure:"severity"` - SeverityAttribute string `mapstructure:"severity_attribute"` + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + GeneratorURL string `mapstructure:"generator_url"` + DefaultSeverity string `mapstructure:"severity"` + SeverityAttribute string `mapstructure:"severity_attribute"` } var _ component.Config = (*Config)(nil) @@ -29,7 +29,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New("endpoint must be non-empty") } if cfg.DefaultSeverity == "" { diff --git a/exporter/alertmanagerexporter/config_test.go b/exporter/alertmanagerexporter/config_test.go index ab3e5443265fd..41a3acda1b42a 100644 --- a/exporter/alertmanagerexporter/config_test.go +++ b/exporter/alertmanagerexporter/config_test.go @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", @@ -107,7 +107,7 @@ func TestConfig_Validate(t *testing.T) { name: "NoEndpoint", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "" + cfg.ClientConfig.Endpoint = "" return cfg }(), wantErr: "endpoint must be non-empty", diff --git a/exporter/alertmanagerexporter/factory.go b/exporter/alertmanagerexporter/factory.go index 1cf729dee7ef5..12155d32d6a0a 100644 --- a/exporter/alertmanagerexporter/factory.go +++ b/exporter/alertmanagerexporter/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), BackoffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:9093", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index dea6407c30c1e..cf486ef4d1f79 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,15 +51,15 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index e2aedf6110b2d..6a405eb8bb792 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index c513b5169e69f..bb284994e3078 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -45,12 +45,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index eac76740b55e0..ff4b68db69c6d 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -349,30 +349,30 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 199361fbbdfcf..cef5b8659b757 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -46,10 +46,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 13a287744bec5..7a0fdc965d374 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -73,26 +73,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 19eac6d6af208..d25d3b86b64df 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -51,11 +51,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 69268d6d94357..ac000d5d1c641 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -75,30 +75,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index c1bc661306a1a..0859d05a9cbbe 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -15,12 +15,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -63,10 +63,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 4d1bd1569ad3a..7f461f2491948 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -104,27 +104,27 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awss3exporter/go.mod b/exporter/awss3exporter/go.mod index a2be0273702ce..04a69ac53b284 100644 --- a/exporter/awss3exporter/go.mod +++ b/exporter/awss3exporter/go.mod @@ -6,12 +6,12 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,16 +58,16 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/awss3exporter/go.sum b/exporter/awss3exporter/go.sum index 2e7ccc8abda1c..b62b8be60cd7c 100644 --- a/exporter/awss3exporter/go.sum +++ b/exporter/awss3exporter/go.sum @@ -139,40 +139,40 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index e63e37624d426..4c8d2e10bf0f4 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,11 +46,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 312a8d9b2fdba..1da660737be18 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -69,30 +69,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 7e39215d53de0..b129396d7453c 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,12 +8,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,11 +64,11 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index bb0b227daf42a..32f42cc225d45 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -127,28 +127,28 @@ github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 6a377ca01e628..0b868534d5eb5 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -45,11 +45,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index d072ca99a99c6..3cd0f4ec6a20d 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -82,30 +82,30 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 6eff0bcc6d9fe..6f70ffe16485f 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,12 +43,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index cee2064b965ca..155322e211e8d 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -62,32 +62,32 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod index 1deeee9711254..a70e6a053f688 100644 --- a/exporter/cassandraexporter/go.mod +++ b/exporter/cassandraexporter/go.mod @@ -6,11 +6,11 @@ require ( github.com/gocql/gocql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,12 +42,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum index 48d0873d18453..432c81b6250a7 100644 --- a/exporter/cassandraexporter/go.sum +++ b/exporter/cassandraexporter/go.sum @@ -74,28 +74,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 15f23c9010540..cda10036a3f38 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -7,13 +7,13 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,11 +53,11 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 7f62ac3ad5c91..8ad91721209e6 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -99,30 +99,30 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/coralogixexporter/config.go b/exporter/coralogixexporter/config.go index 14c92f42ddcb3..61eb020438e42 100644 --- a/exporter/coralogixexporter/config.go +++ b/exporter/coralogixexporter/config.go @@ -27,21 +27,21 @@ type Config struct { // Coralogix domain Domain string `mapstructure:"domain"` // GRPC Settings used with Domain - DomainSettings configgrpc.GRPCClientSettings `mapstructure:"domain_settings"` + DomainSettings configgrpc.ClientConfig `mapstructure:"domain_settings"` // Deprecated: [v0.60.0] Coralogix jaeger based trace endpoint // will be removed in the next version // Please use OTLP endpoint using traces.endpoint - configgrpc.GRPCClientSettings `mapstructure:",squash"` + configgrpc.ClientConfig `mapstructure:",squash"` // Coralogix traces ingress endpoint - Traces configgrpc.GRPCClientSettings `mapstructure:"traces"` + Traces configgrpc.ClientConfig `mapstructure:"traces"` // The Coralogix metrics ingress endpoint - Metrics configgrpc.GRPCClientSettings `mapstructure:"metrics"` + Metrics configgrpc.ClientConfig `mapstructure:"metrics"` // The Coralogix logs ingress endpoint - Logs configgrpc.GRPCClientSettings `mapstructure:"logs"` + Logs configgrpc.ClientConfig `mapstructure:"logs"` // Your Coralogix private key (sensitive) for authentication PrivateKey configopaque.String `mapstructure:"private_key"` @@ -79,11 +79,11 @@ func (c *Config) Validate() error { } // check if headers exists - if len(c.GRPCClientSettings.Headers) == 0 { - c.GRPCClientSettings.Headers = make(map[string]configopaque.String) + if len(c.ClientConfig.Headers) == 0 { + c.ClientConfig.Headers = make(map[string]configopaque.String) } - c.GRPCClientSettings.Headers["ACCESS_TOKEN"] = c.PrivateKey - c.GRPCClientSettings.Headers["appName"] = configopaque.String(c.AppName) + c.ClientConfig.Headers["ACCESS_TOKEN"] = c.PrivateKey + c.ClientConfig.Headers["appName"] = configopaque.String(c.AppName) return nil } @@ -116,7 +116,7 @@ func (c *Config) getMetadataFromResource(res pcommon.Resource) (appName, subsyst return appName, subsystem } -func (c *Config) getDomainGrpcSettings() *configgrpc.GRPCClientSettings { +func (c *Config) getDomainGrpcSettings() *configgrpc.ClientConfig { settings := c.DomainSettings settings.Endpoint = fmt.Sprintf("ingress.%s:443", c.Domain) return &settings diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index 791a5f005293d..fea716656874a 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -45,19 +45,19 @@ func TestLoadConfig(t *testing.T) { // Deprecated: [v0.47.0] SubSystem will remove in the next version SubSystem: "SUBSYSTEM_NAME", TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, TLSSetting: configtls.TLSClientSetting{ @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { WaitForReady: false, BalancerName: "", }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{}, @@ -100,19 +100,19 @@ func TestLoadConfig(t *testing.T) { // Deprecated: [v0.47.0] SubSystem will remove in the next version SubSystem: "SUBSYSTEM_NAME", TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, }, - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, TLSSetting: configtls.TLSClientSetting{ @@ -128,7 +128,7 @@ func TestLoadConfig(t *testing.T) { }, AppNameAttributes: []string{"service.namespace", "k8s.namespace.name"}, SubSystemAttributes: []string{"service.name", "k8s.deployment.name", "k8s.statefulset.name", "k8s.daemonset.name", "k8s.cronjob.name", "k8s.job.name", "k8s.container.name"}, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{}, diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index abdec32fe246a..a0a1b1ff26ade 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -35,24 +35,24 @@ func createDefaultConfig() component.Config { QueueSettings: exporterhelper.NewDefaultQueueSettings(), BackOffConfig: configretry.NewDefaultBackOffConfig(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", }, // Traces GRPC client - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "https://", // Default to gzip compression Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index b2cdfe37a3d76..b3d6a63d5fcea 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -88,7 +88,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -99,7 +99,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -112,7 +112,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoneCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "none", }, @@ -121,7 +121,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "GzipCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Gzip, }, @@ -130,7 +130,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "SnappyCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Snappy, }, @@ -139,7 +139,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZstdCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Zstd, }, @@ -148,7 +148,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -160,7 +160,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NumConsumers", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, }, }, @@ -168,7 +168,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -183,7 +183,7 @@ func TestCreateTracesExporter(t *testing.T) { name: "UseDomain", config: &Config{ Domain: "localhost", - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ TLSSetting: configtls.TLSClientSetting{ Insecure: false, }, diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 961f6c5da6f3c..968ec1cebc0e3 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 @@ -49,15 +49,15 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index bafec9f58fb54..a140d947ea850 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -74,44 +74,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 97b8194b765d4..39695bce64d42 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -377,14 +377,14 @@ type HostMetadataConfig struct { Tags []string `mapstructure:"tags"` } -// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedHTTPClientConfig for more details +// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedClientConfig for more details type LimitedTLSClientSettings struct { // InsecureSkipVerify controls whether a client verifies the server's // certificate chain and host name. InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` } -type LimitedHTTPClientConfig struct { +type LimitedClientConfig struct { TLSSetting LimitedTLSClientSettings `mapstructure:"tls,omitempty"` } @@ -394,7 +394,7 @@ type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - LimitedHTTPClientConfig `mapstructure:",squash"` + LimitedClientConfig `mapstructure:",squash"` TagsConfig `mapstructure:",squash"` diff --git a/exporter/datadogexporter/config_test.go b/exporter/datadogexporter/config_test.go index dfd5e369af77a..a4aaa2edbd938 100644 --- a/exporter/datadogexporter/config_test.go +++ b/exporter/datadogexporter/config_test.go @@ -94,7 +94,7 @@ func TestValidate(t *testing.T) { name: "TLS settings are valid", cfg: &Config{ API: APIConfig{Key: "notnull"}, - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ TLSSetting: LimitedTLSClientSettings{ InsecureSkipVerify: true, }, diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 77155da0524b7..c6a9064f858bd 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -32,23 +32,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -226,17 +226,17 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 5830e7dc9a92e..183fb72b8dd79 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -726,64 +726,64 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 2b16619240b02..0264d0487fad8 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -10,17 +10,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 @@ -140,23 +140,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 37e6c42bab7a2..3f2a5f3effbdd 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -503,64 +503,64 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index 0d1dd5f895205..a51663ebdecb7 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -57,7 +57,7 @@ func newLogsExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() } else { client := clientutil.CreateZorkianClient(string(cfg.API.Key), cfg.Metrics.TCPAddr.Endpoint) @@ -74,7 +74,7 @@ func newLogsExporter( if err != nil { return nil, fmt.Errorf("failed to create logs translator: %w", err) } - s := logs.NewSender(cfg.Logs.TCPAddr.Endpoint, params.Logger, cfg.TimeoutSettings, cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify, cfg.Logs.DumpPayloads, string(cfg.API.Key)) + s := logs.NewSender(cfg.Logs.TCPAddr.Endpoint, params.Logger, cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify, cfg.Logs.DumpPayloads, string(cfg.API.Key)) return &logsExporter{ params: params, diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 7c8dc0040887e..1f7958963b008 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -127,13 +127,13 @@ func newMetricsExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() exporter.metricsAPI = datadogV2.NewMetricsApi(apiClient) } else { client := clientutil.CreateZorkianClient(string(cfg.API.Key), cfg.Metrics.TCPAddr.Endpoint) client.ExtraHeader["User-Agent"] = clientutil.UserAgent(params.BuildInfo) - client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKeyZorkian(params.Logger, client) }() exporter.client = client } diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index cbbe83d164ab7..e9ce7a8ba65cc 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -72,7 +72,7 @@ func newTracesExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() exp.metricsAPI = datadogV2.NewMetricsApi(apiClient) } else { @@ -196,7 +196,7 @@ func newTraceAgent(ctx context.Context, params exporter.CreateSettings, cfg *Con acfg.Ignore["resource"] = cfg.Traces.IgnoreResources acfg.ReceiverPort = 0 // disable HTTP receiver acfg.AgentVersion = fmt.Sprintf("datadogexporter-%s-%s", params.BuildInfo.Command, params.BuildInfo.Version) - acfg.SkipSSLValidation = cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify + acfg.SkipSSLValidation = cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify acfg.ComputeStatsBySpanKind = cfg.Traces.ComputeStatsBySpanKind acfg.PeerServiceAggregation = cfg.Traces.PeerServiceAggregation acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation diff --git a/exporter/datasetexporter/go.mod b/exporter/datasetexporter/go.mod index f948bc763c36b..725ad84ebc778 100644 --- a/exporter/datasetexporter/go.mod +++ b/exporter/datasetexporter/go.mod @@ -8,18 +8,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/scalyr/dataset-go v0.17.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/zap v1.26.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -47,11 +47,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index 54c45d48057c0..16f5e6b7fef97 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -66,28 +66,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/dynatraceexporter/config/config.go b/exporter/dynatraceexporter/config/config.go index 2ea22cb093f63..5d9df8ac11b3d 100644 --- a/exporter/dynatraceexporter/config/config.go +++ b/exporter/dynatraceexporter/config/config.go @@ -19,7 +19,7 @@ import ( // Config defines configuration for the Dynatrace exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -44,8 +44,8 @@ func (c *Config) Validate() error { return fmt.Errorf("queue settings has invalid configuration: %w", err) } - if c.HTTPClientConfig.Headers == nil { - c.HTTPClientConfig.Headers = make(map[string]configopaque.String) + if c.ClientConfig.Headers == nil { + c.ClientConfig.Headers = make(map[string]configopaque.String) } c.APIToken = strings.TrimSpace(c.APIToken) @@ -56,15 +56,15 @@ func (c *Config) Validate() error { return errors.New("api_token is required if Endpoint is provided") } - c.HTTPClientConfig.Headers["Authorization"] = configopaque.String(fmt.Sprintf("Api-Token %s", c.APIToken)) + c.ClientConfig.Headers["Authorization"] = configopaque.String(fmt.Sprintf("Api-Token %s", c.APIToken)) } if !(strings.HasPrefix(c.Endpoint, "http://") || strings.HasPrefix(c.Endpoint, "https://")) { return errors.New("endpoint must start with https:// or http://") } - c.HTTPClientConfig.Headers["Content-Type"] = "text/plain; charset=UTF-8" - c.HTTPClientConfig.Headers["User-Agent"] = "opentelemetry-collector" + c.ClientConfig.Headers["Content-Type"] = "text/plain; charset=UTF-8" + c.ClientConfig.Headers["User-Agent"] = "opentelemetry-collector" return nil } diff --git a/exporter/dynatraceexporter/config/config_test.go b/exporter/dynatraceexporter/config/config_test.go index 78cdb3904b361..6ac082b9b642d 100644 --- a/exporter/dynatraceexporter/config/config_test.go +++ b/exporter/dynatraceexporter/config/config_test.go @@ -22,7 +22,7 @@ func TestConfig_Validate(t *testing.T) { }) t.Run("Valid configuration", func(t *testing.T) { - c := &Config{HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "http://example.com/"}, APIToken: "token"} + c := &Config{ClientConfig: confighttp.ClientConfig{Endpoint: "http://example.com/"}, APIToken: "token"} err := c.Validate() assert.NoError(t, err) @@ -30,7 +30,7 @@ func TestConfig_Validate(t *testing.T) { }) t.Run("Invalid Endpoint", func(t *testing.T) { - c := &Config{HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "example.com"}} + c := &Config{ClientConfig: confighttp.ClientConfig{Endpoint: "example.com"}} err := c.Validate() assert.Error(t, err) }) diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index 0bec7afcf576c..c01baa8ef51e3 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -35,8 +35,8 @@ func createDefaultConfig() component.Config { Enabled: false, }, - APIToken: "", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ""}, + APIToken: "", + ClientConfig: confighttp.ClientConfig{Endpoint: ""}, Tags: []string{}, DefaultDimensions: make(map[string]string), diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index 5676d2dc1bcfb..a4bccad37aede 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: apiconstants.GetDefaultOneAgentEndpoint(), Headers: map[string]configopaque.String{ "Content-Type": "text/plain; charset=UTF-8", @@ -75,7 +75,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com/api/v2/metrics/ingest", Headers: map[string]configopaque.String{ "Authorization": "Api-Token token", @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com/api/v2/metrics/ingest", Headers: map[string]configopaque.String{ "Authorization": "Api-Token token", diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 724e616ca9556..97c0d56212836 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,15 +53,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index c29aaf6325c0d..a914f3ab91a8b 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -74,42 +74,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/dynatraceexporter/metrics_exporter.go b/exporter/dynatraceexporter/metrics_exporter.go index 41628b038ad75..c45a41a1bec52 100644 --- a/exporter/dynatraceexporter/metrics_exporter.go +++ b/exporter/dynatraceexporter/metrics_exporter.go @@ -279,7 +279,7 @@ func (e *metricsExporter) sendBatch(ctx context.Context, lines []string) error { // start starts the exporter func (e *metricsExporter) start(_ context.Context, host component.Host) (err error) { - client, err := e.cfg.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.cfg.ClientConfig.ToClient(host, e.settings) if err != nil { e.settings.Logger.Error("Failed to construct HTTP client", zap.Error(err)) return fmt.Errorf("start: %w", err) diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index f0c08521c47d8..ae31e474dce40 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -145,7 +145,7 @@ func Test_exporter_PushMetricsData(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -308,9 +308,9 @@ func Test_SumMetrics(t *testing.T) { exp := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, - Prefix: "prefix", + APIToken: "token", + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, + Prefix: "prefix", }, client: ts.Client(), prevPts: prevPts, @@ -371,7 +371,7 @@ func Test_exporter_PushMetricsData_EmptyPayload(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -408,7 +408,7 @@ func Test_exporter_PushMetricsData_isDisabled(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), isDisabled: true, @@ -434,7 +434,7 @@ func Test_exporter_send_BadRequest(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -459,7 +459,7 @@ func Test_exporter_send_Unauthorized(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -484,7 +484,7 @@ func Test_exporter_send_TooLarge(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -510,7 +510,7 @@ func Test_exporter_send_NotFound(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -538,7 +538,7 @@ func Test_exporter_send_TooManyRequests(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -561,7 +561,7 @@ func Test_exporter_send_MiscellaneousErrorCode(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -591,7 +591,7 @@ func Test_exporter_send_chunking(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -658,7 +658,7 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { logger: zap.NewNop(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -685,9 +685,9 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { }) } -func Test_exporter_start_InvalidHTTPClientConfig(t *testing.T) { +func Test_exporter_start_InvalidClientConfig(t *testing.T) { cfg := &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index 3fb518be35fea..f755844420bda 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -56,12 +56,12 @@ type Config struct { // https://www.elastic.co/guide/en/elasticsearch/reference/current/ingest.html Pipeline string `mapstructure:"pipeline"` - HTTPClientConfig `mapstructure:",squash"` - Discovery DiscoverySettings `mapstructure:"discover"` - Retry RetrySettings `mapstructure:"retry"` - Flush FlushSettings `mapstructure:"flush"` - Mapping MappingsSettings `mapstructure:"mapping"` - LogstashFormat LogstashFormatSettings `mapstructure:"logstash_format"` + ClientConfig `mapstructure:",squash"` + Discovery DiscoverySettings `mapstructure:"discover"` + Retry RetrySettings `mapstructure:"retry"` + Flush FlushSettings `mapstructure:"flush"` + Mapping MappingsSettings `mapstructure:"mapping"` + LogstashFormat LogstashFormatSettings `mapstructure:"logstash_format"` } type LogstashFormatSettings struct { @@ -74,7 +74,7 @@ type DynamicIndexSetting struct { Enabled bool `mapstructure:"enabled"` } -type HTTPClientConfig struct { +type ClientConfig struct { Authentication AuthenticationSettings `mapstructure:",squash"` // ReadBufferSize for HTTP client. See http.Transport.ReadBufferSize. diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index b91f04fc14d11..5e7ad7a47fa2c 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoad_DeprecatedIndexConfigOption(t *testing.T) { LogsIndex: "logs-generic-default", TracesIndex: "traces-generic-default", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", @@ -110,7 +110,7 @@ func TestLoadConfig(t *testing.T) { LogsIndex: "logs-generic-default", TracesIndex: "trace_index", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { LogsIndex: "my_log_index", TracesIndex: "traces-generic-default", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index 20cf9c9175d57..518eba3eccfff 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -40,7 +40,7 @@ func createDefaultConfig() component.Config { qs.Enabled = false return &Config{ QueueSettings: qs, - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Timeout: 90 * time.Second, }, Index: "", diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 3ceaf6de4425f..ae0539408d82c 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,12 +47,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index e4fe582b0a8a5..972d2b40ea05c 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -73,32 +73,32 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/f5cloudexporter/config_test.go b/exporter/f5cloudexporter/config_test.go index 51adad33c7681..0e82a41ae75ff 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, } - otlphttpCfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + otlphttpCfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "https://f5cloud", ReadBufferSize: 123, WriteBufferSize: 345, @@ -66,8 +66,8 @@ func TestLoadConfig(t *testing.T) { }, } // testing function equality is not supported in Go hence these will be ignored for this test - expectedCfg.HTTPClientConfig.CustomRoundTripper = nil - actualCfg.HTTPClientConfig.CustomRoundTripper = nil + expectedCfg.ClientConfig.CustomRoundTripper = nil + actualCfg.ClientConfig.CustomRoundTripper = nil assert.Equal(t, expectedCfg, actualCfg) } diff --git a/exporter/f5cloudexporter/factory.go b/exporter/f5cloudexporter/factory.go index 308ff8c33bc0f..25eac8407722e 100644 --- a/exporter/f5cloudexporter/factory.go +++ b/exporter/f5cloudexporter/factory.go @@ -97,7 +97,7 @@ func (f *f5cloudFactory) CreateDefaultConfig() component.Config { cfg.Headers["User-Agent"] = "opentelemetry-collector-contrib {{version}}" - cfg.HTTPClientConfig.CustomRoundTripper = func(next http.RoundTripper) (http.RoundTripper, error) { + cfg.ClientConfig.CustomRoundTripper = func(next http.RoundTripper) (http.RoundTripper, error) { ts, err := f.getTokenSource(cfg) if err != nil { return nil, err diff --git a/exporter/f5cloudexporter/factory_test.go b/exporter/f5cloudexporter/factory_test.go index 917282d8422e4..6b0203f15633f 100644 --- a/exporter/f5cloudexporter/factory_test.go +++ b/exporter/f5cloudexporter/factory_test.go @@ -32,8 +32,8 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) - assert.Equal(t, ocfg.HTTPClientConfig.Endpoint, "") - assert.Equal(t, ocfg.HTTPClientConfig.Timeout, 30*time.Second, "default timeout is 30 seconds") + assert.Equal(t, ocfg.ClientConfig.Endpoint, "") + assert.Equal(t, ocfg.ClientConfig.Timeout, 30*time.Second, "default timeout is 30 seconds") assert.Equal(t, ocfg.RetryConfig.Enabled, true, "default retry is enabled") assert.Equal(t, ocfg.RetryConfig.MaxElapsedTime, 300*time.Second, "default retry MaxElapsedTime") assert.Equal(t, ocfg.RetryConfig.InitialInterval, 5*time.Second, "default retry InitialInterval") @@ -44,7 +44,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -75,7 +75,7 @@ func TestFactory_CreateMetricsExporterInvalidConfig(t *testing.T) { func TestFactory_CreateTracesExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -106,7 +106,7 @@ func Test_Factory_CreateTracesExporterInvalidConfig(t *testing.T) { func TestFactory_CreateLogsExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -137,7 +137,7 @@ func TestFactory_CreateLogsExporterInvalidConfig(t *testing.T) { func TestFactory_getTokenSourceFromConfig(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 482e7b3a4e891..60b423824e8f9 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,18 +54,18 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index a278115ee55db..79b7408c798e6 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -123,44 +123,44 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index f709beb0c344c..bc5df36cf6607 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,11 +41,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 1a39b1df1adf8..429b24d4f20a7 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -62,26 +62,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index f8ca774b39584..b2331f53b13de 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,14 +58,14 @@ require ( github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index f2dcaa9b171b9..956c0aa3f38fc 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -142,30 +142,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 535da6fe304d2..bb7106a7da2cf 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,12 +6,12 @@ require ( cloud.google.com/go/pubsub v1.36.1 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -54,10 +54,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 0a18eb00640b7..8063e213f09b6 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -125,26 +125,26 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 7cf7ec0941a60..44f12ed285a4c 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.45.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -72,19 +72,19 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 7a0877b58263e..ca62677e20e01 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -176,40 +176,40 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/exporter/honeycombmarkerexporter/config.go b/exporter/honeycombmarkerexporter/config.go index 4380bd6f0c5b0..47b739f36120d 100644 --- a/exporter/honeycombmarkerexporter/config.go +++ b/exporter/honeycombmarkerexporter/config.go @@ -28,7 +28,7 @@ type Config struct { // Markers is the list of markers to create Markers []Marker `mapstructure:"markers"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` } diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index 222d9f26630a7..45862f5da0a5e 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,17 +54,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index c5e007a6fa233..2ca5f0f2a72ae 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -85,42 +85,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/honeycombmarkerexporter/logs_exporter.go b/exporter/honeycombmarkerexporter/logs_exporter.go index 85dfd927e7474..860c38603f9ee 100644 --- a/exporter/honeycombmarkerexporter/logs_exporter.go +++ b/exporter/honeycombmarkerexporter/logs_exporter.go @@ -40,7 +40,7 @@ type marker struct { type honeycombLogsExporter struct { set component.TelemetrySettings client *http.Client - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig apiURL string apiKey configopaque.String markers []marker @@ -66,7 +66,7 @@ func newHoneycombLogsExporter(set exporter.CreateSettings, config *Config) (*hon } logsExp := &honeycombLogsExporter{ set: telemetrySettings, - httpClientSettings: config.HTTPClientConfig, + httpClientSettings: config.ClientConfig, apiURL: config.APIURL, apiKey: config.APIKey, markers: markers, diff --git a/exporter/influxdbexporter/config.go b/exporter/influxdbexporter/config.go index 1fadb1eb34f75..53103640489bf 100644 --- a/exporter/influxdbexporter/config.go +++ b/exporter/influxdbexporter/config.go @@ -28,7 +28,7 @@ type V1Compatibility struct { // Config defines configuration for the InfluxDB exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 85024ab0de6ac..ea8f355e69b5d 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "override-config"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:8080", Timeout: 500 * time.Millisecond, Headers: map[string]configopaque.String{"User-Agent": "OpenTelemetry -> Influx"}, diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index 792faced9200f..2f8eb08c11f23 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, Headers: map[string]configopaque.String{ "User-Agent": "OpenTelemetry -> Influx", diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 31c32abdcf9ef..e8bad0b5f6fc9 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -8,13 +8,13 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,17 +45,17 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index a30244804c2f1..f6abbd686970b 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -93,43 +93,43 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/influxdbexporter/writer.go b/exporter/influxdbexporter/writer.go index 5bf195130a8e1..b27e99ca9ee05 100644 --- a/exporter/influxdbexporter/writer.go +++ b/exporter/influxdbexporter/writer.go @@ -30,7 +30,7 @@ type influxHTTPWriter struct { encoderPool sync.Pool httpClient *http.Client - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig telemetrySettings component.TelemetrySettings writeURL string payloadMaxLines int @@ -54,7 +54,7 @@ func newInfluxHTTPWriter(logger common.Logger, config *Config, telemetrySettings return e }, }, - httpClientSettings: config.HTTPClientConfig, + httpClientSettings: config.ClientConfig, telemetrySettings: telemetrySettings, writeURL: writeURL, payloadMaxLines: config.PayloadMaxLines, @@ -64,7 +64,7 @@ func newInfluxHTTPWriter(logger common.Logger, config *Config, telemetrySettings } func composeWriteURL(config *Config) (string, error) { - writeURL, err := url.Parse(config.HTTPClientConfig.Endpoint) + writeURL, err := url.Parse(config.ClientConfig.Endpoint) if err != nil { return "", err } @@ -90,20 +90,20 @@ func composeWriteURL(config *Config) (string, error) { if config.V1Compatibility.Username != "" && config.V1Compatibility.Password != "" { basicAuth := base64.StdEncoding.EncodeToString( []byte(config.V1Compatibility.Username + ":" + string(config.V1Compatibility.Password))) - if config.HTTPClientConfig.Headers == nil { - config.HTTPClientConfig.Headers = make(map[string]configopaque.String, 1) + if config.ClientConfig.Headers == nil { + config.ClientConfig.Headers = make(map[string]configopaque.String, 1) } - config.HTTPClientConfig.Headers["Authorization"] = configopaque.String("Basic " + basicAuth) + config.ClientConfig.Headers["Authorization"] = configopaque.String("Basic " + basicAuth) } } else { queryValues.Set("org", config.Org) queryValues.Set("bucket", config.Bucket) if config.Token != "" { - if config.HTTPClientConfig.Headers == nil { - config.HTTPClientConfig.Headers = make(map[string]configopaque.String, 1) + if config.ClientConfig.Headers == nil { + config.ClientConfig.Headers = make(map[string]configopaque.String, 1) } - config.HTTPClientConfig.Headers["Authorization"] = "Token " + config.Token + config.ClientConfig.Headers["Authorization"] = "Token " + config.Token } } diff --git a/exporter/influxdbexporter/writer_test.go b/exporter/influxdbexporter/writer_test.go index cbed0d4f8ef3e..d8d23cc1fd44f 100644 --- a/exporter/influxdbexporter/writer_test.go +++ b/exporter/influxdbexporter/writer_test.go @@ -162,7 +162,7 @@ func Test_influxHTTPWriterBatch_EnqueuePoint_emptyTagValue(t *testing.T) { influxWriter, err := newInfluxHTTPWriter( new(common.NoopLogger), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: noopHTTPServer.URL, }, }, diff --git a/exporter/instanaexporter/config.go b/exporter/instanaexporter/config.go index 9a2d584445d12..7a7c6c95aba0f 100644 --- a/exporter/instanaexporter/config.go +++ b/exporter/instanaexporter/config.go @@ -19,7 +19,7 @@ type Config struct { AgentKey configopaque.String `mapstructure:"agent_key"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/exporter/instanaexporter/config_test.go b/exporter/instanaexporter/config_test.go index 0616290ede0b4..fa05153942b65 100644 --- a/exporter/instanaexporter/config_test.go +++ b/exporter/instanaexporter/config_test.go @@ -28,7 +28,7 @@ func TestConfigValidate(t *testing.T) { }) t.Run("Valid configuration with ca_file", func(t *testing.T) { - c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", HTTPClientConfig: confighttp.HTTPClientConfig{ + c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "ca.crt", diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index fc58c74c1455c..9cdbcfbf3dda9 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -30,7 +30,7 @@ type instanaExporter struct { } func (e *instanaExporter) start(_ context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return err } diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index 405359e0e7ccd..d81a7711202ff 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -27,9 +27,9 @@ func TestPushConvertedTraces(t *testing.T) { defer traceServer.Close() cfg := Config{ - AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: traceServer.URL}, - Endpoint: traceServer.URL, + AgentKey: "key11", + ClientConfig: confighttp.ClientConfig{Endpoint: traceServer.URL}, + Endpoint: traceServer.URL, } instanaExporter := newInstanaExporter(&cfg, exportertest.NewNopCreateSettings()) @@ -82,7 +82,7 @@ func TestSelfSignedBackend(t *testing.T) { cfg := Config{ AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -108,7 +108,7 @@ func TestSelfSignedBackend(t *testing.T) { func TestSelfSignedBackendCAFileNotFound(t *testing.T) { cfg := Config{ AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/instanaexporter/factory.go b/exporter/instanaexporter/factory.go index ff5bbf99770b8..df2749f014dda 100644 --- a/exporter/instanaexporter/factory.go +++ b/exporter/instanaexporter/factory.go @@ -32,7 +32,7 @@ func NewFactory() exporter.Factory { // createDefaultConfig creates the default exporter configuration func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index f62b06579bd7d..63643b76f8558 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -26,7 +26,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -100,7 +100,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 6b5697efd6925..8c20e8ca231c4 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index e2aedf6110b2d..6a405eb8bb792 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index b01b3f5413d80..95de79ef66b20 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -14,14 +14,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -71,11 +71,11 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index e94f20de507f0..be42b321afe42 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -128,32 +128,32 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/kineticaexporter/go.mod b/exporter/kineticaexporter/go.mod index 61558f18760e8..34de1c28ce6bc 100644 --- a/exporter/kineticaexporter/go.mod +++ b/exporter/kineticaexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/samber/lo v1.39.0 github.com/stretchr/testify v1.8.4 github.com/wk8/go-ordered-map/v2 v2.1.8 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -54,12 +54,12 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/ztrue/tracerr v0.3.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/kineticaexporter/go.sum b/exporter/kineticaexporter/go.sum index a835c40288cf3..e19327b8431a7 100644 --- a/exporter/kineticaexporter/go.sum +++ b/exporter/kineticaexporter/go.sum @@ -88,28 +88,28 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/ztrue/tracerr v0.3.0 h1:lDi6EgEYhPYPnKcjsYzmWw4EkFEoA/gfe+I9Y5f+h6Y= github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 71bad2d29dc42..4214331b7e58c 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -83,23 +83,23 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 336c39090ff29..1ad37f262cceb 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -188,57 +188,57 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/loadbalancingexporter/metrics_exporter_test.go b/exporter/loadbalancingexporter/metrics_exporter_test.go index c141fa7118ef8..3163b96f1d413 100644 --- a/exporter/loadbalancingexporter/metrics_exporter_test.go +++ b/exporter/loadbalancingexporter/metrics_exporter_test.go @@ -420,9 +420,9 @@ func TestBuildExporterConfigUnknown(t *testing.T) { exporterCfg := buildExporterConfig(c.(*Config), "the-endpoint") // verify - grpcSettings := defaultCfg.GRPCClientSettings + grpcSettings := defaultCfg.ClientConfig grpcSettings.Endpoint = "the-endpoint" - assert.Equal(t, grpcSettings, exporterCfg.GRPCClientSettings) + assert.Equal(t, grpcSettings, exporterCfg.ClientConfig) assert.Equal(t, defaultCfg.TimeoutSettings, exporterCfg.TimeoutSettings) assert.Equal(t, defaultCfg.QueueConfig, exporterCfg.QueueConfig) diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index 72d48654d97cd..350fe6168d89d 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -310,9 +310,9 @@ func TestBuildExporterConfig(t *testing.T) { exporterCfg := buildExporterConfig(c.(*Config), "the-endpoint") // verify - grpcSettings := defaultCfg.GRPCClientSettings + grpcSettings := defaultCfg.ClientConfig grpcSettings.Endpoint = "the-endpoint" - assert.Equal(t, grpcSettings, exporterCfg.GRPCClientSettings) + assert.Equal(t, grpcSettings, exporterCfg.ClientConfig) assert.Equal(t, defaultCfg.TimeoutSettings, exporterCfg.TimeoutSettings) assert.Equal(t, defaultCfg.QueueConfig, exporterCfg.QueueConfig) diff --git a/exporter/logicmonitorexporter/config.go b/exporter/logicmonitorexporter/config.go index c7c7fa46ab83a..f5625988288dc 100644 --- a/exporter/logicmonitorexporter/config.go +++ b/exporter/logicmonitorexporter/config.go @@ -18,7 +18,7 @@ import ( // Config defines configuration for LogicMonitor exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/logicmonitorexporter/config_test.go b/exporter/logicmonitorexporter/config_test.go index 19113ed173569..2e9cf01edca7b 100644 --- a/exporter/logicmonitorexporter/config_test.go +++ b/exporter/logicmonitorexporter/config_test.go @@ -31,7 +31,7 @@ func TestConfigValidation(t *testing.T) { { name: "empty endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", }, }, @@ -41,7 +41,7 @@ func TestConfigValidation(t *testing.T) { { name: "missing http scheme", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "test.com/dummy", }, }, @@ -51,7 +51,7 @@ func TestConfigValidation(t *testing.T) { { name: "invalid endpoint format", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid.com@#$%", }, }, @@ -61,7 +61,7 @@ func TestConfigValidation(t *testing.T) { { name: "valid config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://validurl.com/rest", }, }, @@ -104,7 +104,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", }, APIToken: APIToken{ @@ -118,7 +118,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", Headers: map[string]configopaque.String{ "Authorization": "Bearer ", @@ -131,7 +131,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", Headers: map[string]configopaque.String{ "Authorization": "Bearer ", diff --git a/exporter/logicmonitorexporter/factory_test.go b/exporter/logicmonitorexporter/factory_test.go index b4772e7014eb0..4f03d0b61ad80 100644 --- a/exporter/logicmonitorexporter/factory_test.go +++ b/exporter/logicmonitorexporter/factory_test.go @@ -38,7 +38,7 @@ func TestCreateLogsExporter(t *testing.T) { { name: "valid config", config: Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, }, @@ -78,7 +78,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "valid config", config: Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, }, diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index 5b996e31bd95e..9f3e3bb84277e 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index a05dab8da8f66..04bd8f013fe2c 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -76,42 +76,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/logicmonitorexporter/logs_exporter.go b/exporter/logicmonitorexporter/logs_exporter.go index 751786cf50728..44ba752f43607 100644 --- a/exporter/logicmonitorexporter/logs_exporter.go +++ b/exporter/logicmonitorexporter/logs_exporter.go @@ -45,7 +45,7 @@ func newLogsExporter(_ context.Context, cfg component.Config, set exporter.Creat } func (e *logExporter) start(ctx context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return fmt.Errorf("failed to create http client: %w", err) } diff --git a/exporter/logicmonitorexporter/logs_exporter_test.go b/exporter/logicmonitorexporter/logs_exporter_test.go index a673cd0f8ec9f..9531bb9afac38 100644 --- a/exporter/logicmonitorexporter/logs_exporter_test.go +++ b/exporter/logicmonitorexporter/logs_exporter_test.go @@ -38,7 +38,7 @@ func Test_NewLogsExporter(t *testing.T) { logger *zap.Logger }{ config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, @@ -68,7 +68,7 @@ func TestPushLogData(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, diff --git a/exporter/logicmonitorexporter/traces_exporter.go b/exporter/logicmonitorexporter/traces_exporter.go index 06912ab87b77a..4f2866da4d777 100644 --- a/exporter/logicmonitorexporter/traces_exporter.go +++ b/exporter/logicmonitorexporter/traces_exporter.go @@ -33,7 +33,7 @@ func newTracesExporter(_ context.Context, cfg component.Config, set exporter.Cre } func (e *tracesExporter) start(ctx context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return fmt.Errorf("failed to create http client: %w", err) } diff --git a/exporter/logicmonitorexporter/traces_exporter_test.go b/exporter/logicmonitorexporter/traces_exporter_test.go index 0cec99b25a54d..34fbd651ffd93 100644 --- a/exporter/logicmonitorexporter/traces_exporter_test.go +++ b/exporter/logicmonitorexporter/traces_exporter_test.go @@ -21,7 +21,7 @@ import ( func Test_NewTracesExporter(t *testing.T) { t.Run("should create Traces exporter", func(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, @@ -45,7 +45,7 @@ func TestPushTraceData(t *testing.T) { params := exportertest.NewNopCreateSettings() f := NewFactory() config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, diff --git a/exporter/logzioexporter/config.go b/exporter/logzioexporter/config.go index d68949e8d7eab..d0d12bfacc8ed 100644 --- a/exporter/logzioexporter/config.go +++ b/exporter/logzioexporter/config.go @@ -15,7 +15,7 @@ import ( // Config contains Logz.io specific configuration such as Account TracesToken, Region, etc. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // confighttp client settings https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp#HTTPClientConfig + confighttp.ClientConfig `mapstructure:",squash"` // confighttp client settings https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp#ClientConfig exporterhelper.QueueSettings `mapstructure:"sending_queue"` // exporter helper queue settings https://pkg.go.dev/go.opentelemetry.io/collector/exporter/exporterhelper#QueueSettings configretry.BackOffConfig `mapstructure:"retry_on_failure"` // exporter helper retry settings https://pkg.go.dev/go.opentelemetry.io/collector/exporter/exporterhelper#RetrySettings Token configopaque.String `mapstructure:"account_token"` // Your Logz.io Account Token, can be found at https://app.logz.io/#/dashboard/settings/general @@ -52,6 +52,6 @@ func (c *Config) checkAndWarnDeprecatedOptions(logger hclog.Logger) { if c.CustomEndpoint != "" { logger.Warn("You are using the deprecated `custom_endpoint` option that will be removed in the next release; please use `endpoint` configuration instead: https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp") logger.Warn("Mapping `custom_endpoint` -> `Endpoint`") - c.HTTPClientConfig.Endpoint = c.CustomEndpoint + c.ClientConfig.Endpoint = c.CustomEndpoint } } diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index 32b75ae74b990..380ce5179e8b8 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { expected.BackOffConfig.MaxInterval = 5 * time.Second expected.QueueSettings = exporterhelper.NewDefaultQueueSettings() expected.QueueSettings.Enabled = false - expected.HTTPClientConfig = confighttp.HTTPClientConfig{ + expected.ClientConfig = confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -67,7 +67,7 @@ func TestDefaultLoadConfig(t *testing.T) { } expected.BackOffConfig = configretry.NewDefaultBackOffConfig() expected.QueueSettings = exporterhelper.NewDefaultQueueSettings() - expected.HTTPClientConfig = confighttp.HTTPClientConfig{ + expected.ClientConfig = confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -88,7 +88,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { CustomEndpoint: "https://api.example.com", QueueMaxLength: 10, DrainInterval: 10, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 10 * time.Second, Headers: map[string]configopaque.String{}, @@ -112,7 +112,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { DrainInterval: 10, BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://api.example.com", Timeout: 10 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/logzioexporter/exporter.go b/exporter/logzioexporter/exporter.go index 6fd0ec1daf9ab..ac8f2ec6bd178 100644 --- a/exporter/logzioexporter/exporter.go +++ b/exporter/logzioexporter/exporter.go @@ -72,7 +72,7 @@ func newLogzioTracesExporter(config *Config, set exporter.CreateSettings) (expor if err != nil { return nil, err } - exporter.config.HTTPClientConfig.Endpoint, err = generateEndpoint(config) + exporter.config.ClientConfig.Endpoint, err = generateEndpoint(config) if err != nil { return nil, err } @@ -94,7 +94,7 @@ func newLogzioLogsExporter(config *Config, set exporter.CreateSettings) (exporte if err != nil { return nil, err } - exporter.config.HTTPClientConfig.Endpoint, err = generateEndpoint(config) + exporter.config.ClientConfig.Endpoint, err = generateEndpoint(config) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func newLogzioLogsExporter(config *Config, set exporter.CreateSettings) (exporte } func (exporter *logzioExporter) start(_ context.Context, host component.Host) error { - client, err := exporter.config.HTTPClientConfig.ToClient(host, exporter.settings) + client, err := exporter.config.ClientConfig.ToClient(host, exporter.settings) if err != nil { return err } @@ -145,7 +145,7 @@ func (exporter *logzioExporter) pushLogData(ctx context.Context, ld plog.Logs) e } } } - err := exporter.export(ctx, exporter.config.HTTPClientConfig.Endpoint, dataBuffer.Bytes()) + err := exporter.export(ctx, exporter.config.ClientConfig.Endpoint, dataBuffer.Bytes()) // reset the data buffer after each export to prevent duplicated data dataBuffer.Reset() return err @@ -220,7 +220,7 @@ func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces ptrace } } } - err = exporter.export(ctx, exporter.config.HTTPClientConfig.Endpoint, dataBuffer.Bytes()) + err = exporter.export(ctx, exporter.config.ClientConfig.Endpoint, dataBuffer.Bytes()) // reset the data buffer after each export to prevent duplicated data dataBuffer.Reset() return err diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 116c11f9e34d0..c55b886e683ca 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -190,7 +190,7 @@ func TestExportErrors(tester *testing.T) { cfg := &Config{ Region: "", Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, }, } @@ -244,7 +244,7 @@ func TestPushTraceData(tester *testing.T) { cfg := Config{ Token: "token", Region: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, @@ -277,7 +277,7 @@ func TestPushLogsData(tester *testing.T) { cfg := Config{ Token: "token", Region: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 43d80763da963..d4a6f1bc98c20 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -39,7 +39,7 @@ func createDefaultConfig() component.Config { Token: "", BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -78,11 +78,11 @@ func getListenerURL(region string) string { func generateEndpoint(cfg *Config) (string, error) { defaultURL := fmt.Sprintf("%s/?token=%s", getListenerURL(""), string(cfg.Token)) switch { - case cfg.HTTPClientConfig.Endpoint != "": - return cfg.HTTPClientConfig.Endpoint, nil + case cfg.ClientConfig.Endpoint != "": + return cfg.ClientConfig.Endpoint, nil case cfg.Region != "": return fmt.Sprintf("%s/?token=%s", getListenerURL(cfg.Region), string(cfg.Token)), nil - case cfg.HTTPClientConfig.Endpoint == "" && cfg.Region == "": + case cfg.ClientConfig.Endpoint == "" && cfg.Region == "": return defaultURL, errors.New("failed to generate endpoint, Endpoint or Region must be set") default: return defaultURL, nil diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index aa4a5ad18b348..60624fa977cd5 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -63,7 +63,7 @@ func TestGenerateUrl(t *testing.T) { cfg := &Config{ Region: test.region, Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: test.endpoint, }, } diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 7bcf1b50a9842..a2da4cabf3fae 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -58,15 +58,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index c30fef55fe9e5..38ac4acebdc49 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -93,44 +93,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/logzioexporter/jsonlog_test.go b/exporter/logzioexporter/jsonlog_test.go index 6bb3736b221ba..3d092916153ca 100644 --- a/exporter/logzioexporter/jsonlog_test.go +++ b/exporter/logzioexporter/jsonlog_test.go @@ -85,7 +85,7 @@ func TestSetTimeStamp(t *testing.T) { cfg := &Config{ Region: "us", Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, diff --git a/exporter/lokiexporter/config.go b/exporter/lokiexporter/config.go index ef1894de46538..1ac2257282863 100644 --- a/exporter/lokiexporter/config.go +++ b/exporter/lokiexporter/config.go @@ -14,7 +14,7 @@ import ( // Config defines configuration for Loki exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index dcbb62a9db97e..bd0078f5ca5ae 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfigNewExporter(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "X-Custom-Header": "loki_rocks", }, @@ -110,7 +110,7 @@ func TestConfigValidate(t *testing.T) { { desc: "Config is valid", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://loki.example.com", }, }, diff --git a/exporter/lokiexporter/exporter.go b/exporter/lokiexporter/exporter.go index 653e898d7fbb1..862ae11425955 100644 --- a/exporter/lokiexporter/exporter.go +++ b/exporter/lokiexporter/exporter.go @@ -95,12 +95,12 @@ func (l *lokiExporter) sendPushRequest(ctx context.Context, tenant string, reque return consumererror.NewPermanent(err) } - req, err := http.NewRequestWithContext(ctx, "POST", l.config.HTTPClientConfig.Endpoint, bytes.NewReader(buf)) + req, err := http.NewRequestWithContext(ctx, "POST", l.config.ClientConfig.Endpoint, bytes.NewReader(buf)) if err != nil { return consumererror.NewPermanent(err) } - for k, v := range l.config.HTTPClientConfig.Headers { + for k, v := range l.config.ClientConfig.Headers { req.Header.Set(k, string(v)) } req.Header.Set("Content-Type", "application/x-protobuf") @@ -149,7 +149,7 @@ func encode(pb proto.Message) ([]byte, error) { } func (l *lokiExporter) start(_ context.Context, host component.Host) (err error) { - client, err := l.config.HTTPClientConfig.ToClient(host, l.settings) + client, err := l.config.ClientConfig.ToClient(host, l.settings) if err != nil { return err } diff --git a/exporter/lokiexporter/exporter_test.go b/exporter/lokiexporter/exporter_test.go index 388c52a3da6db..c2dfd7f751a0f 100644 --- a/exporter/lokiexporter/exporter_test.go +++ b/exporter/lokiexporter/exporter_test.go @@ -76,7 +76,7 @@ func TestPushLogData(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, } @@ -255,7 +255,7 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, } diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 44c01124fcd8e..d82d0ee1355f9 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -30,7 +30,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/lokiexporter/factory_test.go b/exporter/lokiexporter/factory_test.go index 18ff2230db7e1..90def8d7a17e0 100644 --- a/exporter/lokiexporter/factory_test.go +++ b/exporter/lokiexporter/factory_test.go @@ -21,7 +21,7 @@ const ( func TestExporter_new(t *testing.T) { t.Run("with valid config", func(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } @@ -33,7 +33,7 @@ func TestExporter_new(t *testing.T) { func TestExporter_startReturnsNillWhenValidConfig(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } @@ -45,10 +45,10 @@ func TestExporter_startReturnsNillWhenValidConfig(t *testing.T) { func TestExporter_startReturnsErrorWhenInvalidHttpClientSettings(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { - return nil, fmt.Errorf("this causes HTTPClientConfig.ToClient() to error") + return nil, fmt.Errorf("this causes ClientConfig.ToClient() to error") }, }, } @@ -60,7 +60,7 @@ func TestExporter_startReturnsErrorWhenInvalidHttpClientSettings(t *testing.T) { func TestExporter_stopAlwaysReturnsNil(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 7288b30b8cf5f..92f1ebd49cc7c 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -11,16 +11,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.93.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -60,15 +60,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index c9adac6a34ef3..82c2d0529921b 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -103,44 +103,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/mezmoexporter/config.go b/exporter/mezmoexporter/config.go index 90273e86bee98..691f19f54094d 100644 --- a/exporter/mezmoexporter/config.go +++ b/exporter/mezmoexporter/config.go @@ -33,7 +33,7 @@ const ( // Config defines configuration for Mezmo exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -45,8 +45,8 @@ type Config struct { } // returns default http client settings -func createDefaultHTTPClientConfig() confighttp.HTTPClientConfig { - return confighttp.HTTPClientConfig{ +func createDefaultClientConfig() confighttp.ClientConfig { + return confighttp.ClientConfig{ Timeout: defaultTimeout, } } diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index a9c79ebe441b6..953ea71aa7787 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.BackOffConfig{ diff --git a/exporter/mezmoexporter/exporter.go b/exporter/mezmoexporter/exporter.go index dae85fadb94da..4c10b8c9ce726 100644 --- a/exporter/mezmoexporter/exporter.go +++ b/exporter/mezmoexporter/exporter.go @@ -59,7 +59,7 @@ func (m *mezmoExporter) pushLogData(_ context.Context, ld plog.Logs) error { } func (m *mezmoExporter) start(_ context.Context, host component.Host) (err error) { - m.client, err = m.config.HTTPClientConfig.ToClient(host, m.settings) + m.client, err = m.config.ClientConfig.ToClient(host, m.settings) return err } diff --git a/exporter/mezmoexporter/factory.go b/exporter/mezmoexporter/factory.go index 76e3dcec19ec7..f771189aad26b 100644 --- a/exporter/mezmoexporter/factory.go +++ b/exporter/mezmoexporter/factory.go @@ -27,10 +27,10 @@ func NewFactory() exporter.Factory { // Create a default Memzo config func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: createDefaultHTTPClientConfig(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), - IngestURL: defaultIngestURL, + ClientConfig: createDefaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), + IngestURL: defaultIngestURL, } } diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index da7e1530c2ed7..e2eda355ae900 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -33,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { IngestURL: defaultIngestURL, IngestKey: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.NewDefaultBackOffConfig(), diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index a2792b47cd64b..f5dcf6488c876 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -5,14 +5,14 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,17 +47,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index e2aedf6110b2d..6a405eb8bb792 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index fb1e7a118861d..7890a95609c0d 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -12,9 +12,9 @@ import ( // Config defines configuration for OpenCensus exporter. type Config struct { - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - exporterhelper.QueueSettings `mapstructure:"sending_queue"` - configretry.BackOffConfig `mapstructure:"retry_on_failure"` + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + exporterhelper.QueueSettings `mapstructure:"sending_queue"` + configretry.BackOffConfig `mapstructure:"retry_on_failure"` // The number of workers that send the gRPC requests. NumWorkers int `mapstructure:"num_workers"` diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 8d4f2be346b59..5e80135b82918 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index 1d6f94c3e2759..4cf079f447dcc 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -26,7 +26,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ // We almost read 0 bytes, so no need to tune ReadBufferSize. WriteBufferSize: 512 * 1024, }, diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 67e4f4a7d3f71..54f8409442e2f 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -37,7 +37,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoEndpoint", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumWorkers: 3, @@ -47,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZeroNumWorkers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -60,7 +60,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -72,7 +72,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "gzip", }, @@ -96,7 +96,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -109,7 +109,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "unknown compression", }, @@ -121,7 +121,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -135,7 +135,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 8d81e61f36664..ed53bdf25fd3b 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,16 +9,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -59,16 +59,16 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 72b5052584285..dc8b804dbfeac 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -122,46 +122,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index 530241478abc4..0cedb5130ab65 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -64,7 +64,7 @@ func newOcExporter(_ context.Context, cfg *Config, settings component.TelemetryS metadata: metadata.New(nil), settings: settings, } - for k, v := range cfg.GRPCClientSettings.Headers { + for k, v := range cfg.ClientConfig.Headers { oce.metadata.Set(k, string(v)) } return oce, nil @@ -72,7 +72,7 @@ func newOcExporter(_ context.Context, cfg *Config, settings component.TelemetryS // start creates the gRPC client Connection func (oce *ocExporter) start(ctx context.Context, host component.Host) error { - clientConn, err := oce.cfg.GRPCClientSettings.ToClientConn(ctx, host, oce.settings) + clientConn, err := oce.cfg.ClientConfig.ToClientConn(ctx, host, oce.settings) if err != nil { return err } diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 11f5a403893aa..947c632bbb950 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -28,7 +28,7 @@ func TestSendTraces(t *testing.T) { rFactory := opencensusreceiver.NewFactory() rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) - rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint + rCfg.ServerConfig.NetAddr.Endpoint = endpoint set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateTracesReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) @@ -39,7 +39,7 @@ func TestSendTraces(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -81,7 +81,7 @@ func TestSendTraces(t *testing.T) { func TestSendTraces_NoBackend(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -105,7 +105,7 @@ func TestSendTraces_NoBackend(t *testing.T) { func TestSendTraces_AfterStop(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -127,7 +127,7 @@ func TestSendMetrics(t *testing.T) { rFactory := opencensusreceiver.NewFactory() rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) - rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint + rCfg.ServerConfig.NetAddr.Endpoint = endpoint set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateMetricsReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) @@ -138,7 +138,7 @@ func TestSendMetrics(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -178,7 +178,7 @@ func TestSendMetrics(t *testing.T) { func TestSendMetrics_NoBackend(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -202,7 +202,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { func TestSendMetrics_AfterStop(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/opensearchexporter/config.go b/exporter/opensearchexporter/config.go index d17737480bd16..c8546a6d407ae 100644 --- a/exporter/opensearchexporter/config.go +++ b/exporter/opensearchexporter/config.go @@ -28,7 +28,7 @@ const ( // Config defines configuration for OpenSearch exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:"http"` + confighttp.ClientConfig `mapstructure:"http"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` exporterhelper.TimeoutSettings `mapstructure:",squash"` MappingsSettings `mapstructure:"mapping"` diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index 7cf63ecbcb41a..f974ad004f2f0 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ Dataset: "ngnix", Namespace: "eu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: sampleEndpoint, Timeout: 2 * time.Minute, Headers: map[string]configopaque.String{ diff --git a/exporter/opensearchexporter/factory.go b/exporter/opensearchexporter/factory.go index 3a7e03561911d..75a74580f7f0b 100644 --- a/exporter/opensearchexporter/factory.go +++ b/exporter/opensearchexporter/factory.go @@ -30,7 +30,7 @@ func NewFactory() exporter.Factory { func newDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), Dataset: defaultDataset, Namespace: defaultNamespace, BulkAction: defaultBulkAction, diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index b4a4b9e925e01..1e56b4b6a8a27 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/opensearch-project/opensearch-go/v2 v2.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -58,15 +58,15 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 7c0c4a54f8a70..2d9bd01eac086 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -100,42 +100,42 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opensearchexporter/sso_log_exporter.go b/exporter/opensearchexporter/sso_log_exporter.go index bda030a09d88d..ba515222de2fa 100644 --- a/exporter/opensearchexporter/sso_log_exporter.go +++ b/exporter/opensearchexporter/sso_log_exporter.go @@ -19,7 +19,7 @@ type logExporter struct { Index string bulkAction string model mappingModel - httpSettings confighttp.HTTPClientConfig + httpSettings confighttp.ClientConfig telemetry component.TelemetrySettings } @@ -43,7 +43,7 @@ func newLogExporter(cfg *Config, set exporter.CreateSettings) (*logExporter, err telemetry: set.TelemetrySettings, Index: getIndexName(cfg.Dataset, cfg.Namespace, cfg.LogsIndex), bulkAction: cfg.BulkAction, - httpSettings: cfg.HTTPClientConfig, + httpSettings: cfg.ClientConfig, model: model, }, nil } diff --git a/exporter/opensearchexporter/sso_trace_exporter.go b/exporter/opensearchexporter/sso_trace_exporter.go index f0f1aee5ae7db..8742793fc3a18 100644 --- a/exporter/opensearchexporter/sso_trace_exporter.go +++ b/exporter/opensearchexporter/sso_trace_exporter.go @@ -21,7 +21,7 @@ type ssoTracesExporter struct { Dataset string bulkAction string model mappingModel - httpSettings confighttp.HTTPClientConfig + httpSettings confighttp.ClientConfig telemetry component.TelemetrySettings } @@ -41,7 +41,7 @@ func newSSOTracesExporter(cfg *Config, set exporter.CreateSettings) (*ssoTracesE Dataset: cfg.Dataset, bulkAction: cfg.BulkAction, model: model, - httpSettings: cfg.HTTPClientConfig, + httpSettings: cfg.ClientConfig, }, nil } diff --git a/exporter/otelarrowexporter/config.go b/exporter/otelarrowexporter/config.go index c19fd270d7da3..213cbbe397402 100644 --- a/exporter/otelarrowexporter/config.go +++ b/exporter/otelarrowexporter/config.go @@ -28,7 +28,7 @@ type Config struct { RetrySettings configretry.BackOffConfig `mapstructure:"retry_on_failure"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // Arrow includes settings specific to OTel Arrow. Arrow ArrowSettings `mapstructure:"arrow"` diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 9d0c9e4e57d74..2b4e898656b1d 100644 --- a/exporter/otelarrowexporter/config_test.go +++ b/exporter/otelarrowexporter/config_test.go @@ -31,7 +31,7 @@ func TestUnmarshalDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.NoError(t, component.UnmarshalConfig(cm, cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) - assert.Equal(t, "round_robin", cfg.(*Config).GRPCClientSettings.BalancerName) + assert.Equal(t, "round_robin", cfg.(*Config).ClientConfig.BalancerName) } func TestUnmarshalConfig(t *testing.T) { @@ -58,7 +58,7 @@ func TestUnmarshalConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", diff --git a/exporter/otelarrowexporter/factory.go b/exporter/otelarrowexporter/factory.go index 0fd54f3b892ae..bfbb6a03c30ef 100644 --- a/exporter/otelarrowexporter/factory.go +++ b/exporter/otelarrowexporter/factory.go @@ -42,7 +42,7 @@ func createDefaultConfig() component.Config { RetrySettings: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{}, // Default to zstd compression Compression: configcompression.Zstd, diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go index 6fbf626f2d0f0..3b6304c1996df 100644 --- a/exporter/otelarrowexporter/factory_test.go +++ b/exporter/otelarrowexporter/factory_test.go @@ -47,7 +47,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) @@ -66,7 +66,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoEndpoint", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, }, @@ -75,7 +75,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -99,7 +99,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoneCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "none", }, @@ -108,7 +108,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "GzipCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Gzip, }, @@ -117,7 +117,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "SnappyCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Snappy, }, @@ -126,7 +126,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZstdCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Zstd, }, @@ -135,7 +135,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -147,7 +147,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NumConsumers", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, }, }, @@ -155,7 +155,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -168,7 +168,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -213,7 +213,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateLogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) @@ -224,7 +224,7 @@ func TestCreateLogsExporter(t *testing.T) { func TestCreateArrowTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) cfg.Arrow = ArrowSettings{ NumStreams: 1, } diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index 891c1ea28c5e7..eb828e256a77c 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -6,17 +6,17 @@ require ( github.com/open-telemetry/otel-arrow v0.16.0 github.com/open-telemetry/otel-arrow/collector v0.16.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -68,17 +68,17 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index 5495b86a1479d..7f0a13dcbb636 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -157,50 +157,50 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/otelarrowexporter/otelarrow.go b/exporter/otelarrowexporter/otelarrow.go index 4a6d167083b89..c1e689e3c01a1 100644 --- a/exporter/otelarrowexporter/otelarrow.go +++ b/exporter/otelarrowexporter/otelarrow.go @@ -51,7 +51,7 @@ func newExporter(cfg component.Config, set exporter.CreateSettings, _ streamClie func (e *baseExporter) start(ctx context.Context, host component.Host) (err error) { // TODO: Implementation: the following is a placeholder used // to satisfy gRPC configuration-related configuration errors. - if _, err = e.config.GRPCClientSettings.ToClientConn(ctx, host, e.settings.TelemetrySettings); err != nil { + if _, err = e.config.ClientConfig.ToClientConn(ctx, host, e.settings.TelemetrySettings); err != nil { return err } return nil diff --git a/exporter/prometheusexporter/README.md b/exporter/prometheusexporter/README.md index 0e5686fb93c70..85c95358349c7 100644 --- a/exporter/prometheusexporter/README.md +++ b/exporter/prometheusexporter/README.md @@ -25,7 +25,7 @@ Exports data in the [Prometheus format](https://prometheus.io/docs/concepts/data The following settings are required: -- `endpoint` (no default): the address on which metrics will be exposed, using path `/metrics`. For full list of `HTTPServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). +- `endpoint` (no default): the address on which metrics will be exposed, using path `/metrics`. For full list of `ServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The following settings can be optionally configured: diff --git a/exporter/prometheusexporter/config.go b/exporter/prometheusexporter/config.go index 04172110191d7..811823e734e5b 100644 --- a/exporter/prometheusexporter/config.go +++ b/exporter/prometheusexporter/config.go @@ -15,7 +15,7 @@ import ( // Config defines configuration for Prometheus exporter. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // Namespace if set, exports metrics under the provided value. Namespace string `mapstructure:"namespace"` diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 98c153d839c5a..833a1a1237767 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "2"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "1.2.3.4:1234", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/prometheusexporter/end_to_end_test.go b/exporter/prometheusexporter/end_to_end_test.go index 96f745859d1bf..9f667e82fe728 100644 --- a/exporter/prometheusexporter/end_to_end_test.go +++ b/exporter/prometheusexporter/end_to_end_test.go @@ -57,7 +57,7 @@ func TestEndToEndSummarySupport(t *testing.T) { // 2. Create the Prometheus metrics exporter that'll receive and verify the metrics produced. exporterCfg := &Config{ Namespace: "test", - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8787", }, SendTimestamps: true, diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index d880e56803376..25778eb1ceba2 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -11,15 +11,15 @@ require ( github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -136,16 +136,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index d12d086e8373e..97d1250963fba 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -519,49 +519,49 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 84366967d3853..763f3a34fef2b 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -39,7 +39,7 @@ func TestPrometheusExporter(t *testing.T) { "foo0": "bar0", "code0": "one0", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8999", }, SendTimestamps: false, @@ -48,7 +48,7 @@ func TestPrometheusExporter(t *testing.T) { }, { config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:88999", }, }, @@ -96,7 +96,7 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -181,7 +181,7 @@ func TestPrometheusExporter_endToEndMultipleTargets(t *testing.T) { "foo1": "bar1", "code1": "one1", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, MetricExpiration: 120 * time.Minute, @@ -263,7 +263,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) { "foo1": "bar1", "code1": "one1", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, MetricExpiration: 120 * time.Minute, @@ -339,7 +339,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, SendTimestamps: true, @@ -416,7 +416,7 @@ func TestPrometheusExporter_endToEndWithResource(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, SendTimestamps: true, diff --git a/exporter/prometheusremotewriteexporter/config.go b/exporter/prometheusremotewriteexporter/config.go index 238e5fc8bf9d0..f63468783b1f8 100644 --- a/exporter/prometheusremotewriteexporter/config.go +++ b/exporter/prometheusremotewriteexporter/config.go @@ -30,7 +30,7 @@ type Config struct { // ExternalLabels defines a map of label keys and values that are allowed to start with reserved prefix "__" ExternalLabels map[string]string `mapstructure:"external_labels"` - HTTPClientConfig confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + ClientConfig confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // maximum size in bytes of time series batch sent to remote storage MaxBatchSizeBytes int `mapstructure:"max_batch_size_bytes"` diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 7db787d6cc9ad..8b6b7345fe77b 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { AddMetricSuffixes: false, Namespace: "test-space", ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8888", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index b095bb1d81029..7833efac299df 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -40,7 +40,7 @@ type prwExporter struct { concurrency int userAgentHeader string maxBatchSizeBytes int - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig settings component.TelemetrySettings retrySettings configretry.BackOffConfig wal *prweWAL @@ -54,7 +54,7 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err return nil, err } - endpointURL, err := url.ParseRequestURI(cfg.HTTPClientConfig.Endpoint) + endpointURL, err := url.ParseRequestURI(cfg.ClientConfig.Endpoint) if err != nil { return nil, errors.New("invalid endpoint") } @@ -68,7 +68,7 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err userAgentHeader: userAgentHeader, maxBatchSizeBytes: cfg.MaxBatchSizeBytes, concurrency: cfg.RemoteWriteQueue.NumConsumers, - clientSettings: &cfg.HTTPClientConfig, + clientSettings: &cfg.ClientConfig, settings: set.TelemetrySettings, retrySettings: cfg.BackOffConfig, exporterSettings: prometheusremotewrite.Settings{ diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index a9bd7e1d8481f..ca146d84ff5a4 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -36,11 +36,11 @@ import ( // Test_NewPRWExporter checks that a new exporter instance with non-nil fields is initialized func Test_NewPRWExporter(t *testing.T) { cfg := &Config{ - TimeoutSettings: exporterhelper.TimeoutSettings{}, - BackOffConfig: configretry.BackOffConfig{}, - Namespace: "", - ExternalLabels: map[string]string{}, - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ""}, + TimeoutSettings: exporterhelper.TimeoutSettings{}, + BackOffConfig: configretry.BackOffConfig{}, + Namespace: "", + ExternalLabels: map[string]string{}, + ClientConfig: confighttp.ClientConfig{Endpoint: ""}, TargetInfo: &TargetInfo{ Enabled: true, }, @@ -107,7 +107,7 @@ func Test_NewPRWExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - cfg.HTTPClientConfig.Endpoint = tt.endpoint + cfg.ClientConfig.Endpoint = tt.endpoint cfg.ExternalLabels = tt.externalLabels cfg.Namespace = tt.namespace cfg.RemoteWriteQueue.NumConsumers = 1 @@ -159,7 +159,7 @@ func Test_Start(t *testing.T) { returnErrorOnStartUp bool set exporter.CreateSettings endpoint string - clientSettings confighttp.HTTPClientConfig + clientSettings confighttp.ClientConfig }{ { name: "success_case", @@ -168,7 +168,7 @@ func Test_Start(t *testing.T) { concurrency: 5, externalLabels: map[string]string{"Key1": "Val1"}, set: set, - clientSettings: confighttp.HTTPClientConfig{Endpoint: "https://some.url:9411/api/prom/push"}, + clientSettings: confighttp.ClientConfig{Endpoint: "https://some.url:9411/api/prom/push"}, }, { name: "invalid_tls", @@ -178,7 +178,7 @@ func Test_Start(t *testing.T) { externalLabels: map[string]string{"Key1": "Val1"}, set: set, returnErrorOnStartUp: true, - clientSettings: confighttp.HTTPClientConfig{ + clientSettings: confighttp.ClientConfig{ Endpoint: "https://some.url:9411/api/prom/push", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -198,7 +198,7 @@ func Test_Start(t *testing.T) { cfg.ExternalLabels = tt.externalLabels cfg.Namespace = tt.namespace cfg.RemoteWriteQueue.NumConsumers = 1 - cfg.HTTPClientConfig = tt.clientSettings + cfg.ClientConfig = tt.clientSettings prwe, err := newPRWExporter(cfg, tt.set) assert.NoError(t, err) @@ -344,7 +344,7 @@ func runExportPipeline(ts *prompb.TimeSeries, endpoint *url.URL) error { } cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = endpoint.String() + cfg.ClientConfig.Endpoint = endpoint.String() cfg.RemoteWriteQueue.NumConsumers = 1 cfg.BackOffConfig = configretry.BackOffConfig{ Enabled: true, @@ -686,7 +686,7 @@ func Test_PushMetrics(t *testing.T) { } cfg := &Config{ Namespace: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, // We almost read 0 bytes, so no need to tune ReadBufferSize. ReadBufferSize: 0, @@ -872,7 +872,7 @@ func TestWALOnExporterRoundTrip(t *testing.T) { tempDir := t.TempDir() cfg := &Config{ Namespace: "test_ns", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: prweServer.URL, }, RemoteWriteQueue: RemoteWriteQueue{NumConsumers: 1}, diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index f874a1797ddb5..d0a0f8555513a 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -78,7 +78,7 @@ func createDefaultConfig() component.Config { BackOffConfig: retrySettings, AddMetricSuffixes: true, SendMetadata: false, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://some.url:9411/api/prom/push", // We almost read 0 bytes, so no need to tune ReadBufferSize. ReadBufferSize: 0, diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index 026242c57eacb..1559b37bd19ac 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -27,9 +27,9 @@ func Test_createDefaultConfig(t *testing.T) { func Test_createMetricsExporter(t *testing.T) { invalidConfig := createDefaultConfig().(*Config) - invalidConfig.HTTPClientConfig = confighttp.HTTPClientConfig{} + invalidConfig.ClientConfig = confighttp.ClientConfig{} invalidTLSConfig := createDefaultConfig().(*Config) - invalidTLSConfig.HTTPClientConfig.TLSSetting = configtls.TLSClientSetting{ + invalidTLSConfig.ClientConfig.TLSSetting = configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "non-existent file", CertFile: "", diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 108ac117aabff..5c68e41c50e68 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -14,15 +14,15 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,16 +58,16 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index dfd0577b97f88..5eaceae3e6a39 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -86,44 +86,44 @@ github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index e7f66d7d247ca..70978e7f379d7 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -68,10 +68,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 8fdb5f3f4d688..29ae3dfad16bb 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -413,30 +413,30 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index e3b079d950a41..bde3c6932851d 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -12,13 +12,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,11 +50,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 05c142bcfb341..189b25320995e 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -109,30 +109,30 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 709fb908aac45..f2f69bb956460 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,12 +40,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 1367ed7489b72..e35dbf24b4b5d 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -66,28 +66,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index 66a349a79d994..4984033c7475e 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -52,7 +52,7 @@ var _ confmap.Unmarshaler = (*Config)(nil) type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // AccessToken is the authentication token provided by SignalFx. AccessToken configopaque.String `mapstructure:"access_token"` @@ -220,7 +220,7 @@ func (cfg *Config) Validate() error { ` "ingest_url" and "api_url" should be explicitly set`) } - if cfg.HTTPClientConfig.Timeout < 0 { + if cfg.ClientConfig.Timeout < 0 { return errors.New(`cannot have a negative "timeout"`) } diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 92cf300da67ba..a9d359eed0234 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -48,7 +48,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AccessToken: "testToken", Realm: "ap0", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Headers: nil, MaxIdleConns: &hundred, @@ -85,7 +85,7 @@ func TestLoadConfig(t *testing.T) { DeltaTranslationTTL: 3600, ExcludeProperties: nil, Correlation: &correlation.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 5 * time.Second, }, @@ -111,7 +111,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AccessToken: "testToken", Realm: "us1", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 2 * time.Second, Headers: map[string]configopaque.String{ "added-entry": "added value", @@ -244,7 +244,7 @@ func TestLoadConfig(t *testing.T) { }, }, Correlation: &correlation.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 5 * time.Second, }, @@ -494,9 +494,9 @@ func TestConfigValidateErrors(t *testing.T) { { name: "Negative Timeout", cfg: &Config{ - Realm: "us0", - AccessToken: "access_token", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: -1 * time.Second}, + Realm: "us0", + AccessToken: "access_token", + ClientConfig: confighttp.ClientConfig{Timeout: -1 * time.Second}, }, }, { diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index bce3387370764..becef412f2039 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -214,7 +214,7 @@ func (se *signalfxExporter) startLogs(_ context.Context, host component.Host) er } func (se *signalfxExporter) createClient(host component.Host) (*http.Client, error) { - se.config.HTTPClientConfig.TLSSetting = se.config.IngestTLSSettings + se.config.ClientConfig.TLSSetting = se.config.IngestTLSSettings return se.config.ToClient(host, se.telemetrySettings) } @@ -260,11 +260,11 @@ func buildHeaders(config *Config, version string) map[string]string { // Add any custom headers from the config. They will override the pre-defined // ones above in case of conflict, but, not the content encoding one since // the latter one is defined according to the payload. - for k, v := range config.HTTPClientConfig.Headers { + for k, v := range config.ClientConfig.Headers { headers[k] = string(v) } // we want to control how headers are set, overriding user headers with our passthrough. - config.HTTPClientConfig.Headers = nil + config.ClientConfig.Headers = nil return headers } diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 05e67dd0ffce7..a985b15331d25 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -67,9 +67,9 @@ func TestNew(t *testing.T) { { name: "successfully create exporter", config: &Config{ - AccessToken: "someToken", - Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + AccessToken: "someToken", + Realm: "xyz", + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, }, }, { @@ -77,7 +77,7 @@ func TestNew(t *testing.T) { config: &Config{ AccessToken: "someToken", Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, SyncHostMetadata: true, }, }, @@ -180,7 +180,7 @@ func TestConsumeMetrics(t *testing.T) { assert.NoError(t, err) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 1 * time.Second, Headers: map[string]configopaque.String{"test_header_": "test"}, }, @@ -402,11 +402,11 @@ func TestConsumeMetricsWithAccessTokenPassthrough(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.IngestURL = server.URL cfg.APIURL = server.URL - cfg.HTTPClientConfig.Headers = make(map[string]configopaque.String) + cfg.ClientConfig.Headers = make(map[string]configopaque.String) for k, v := range tt.additionalHeaders { - cfg.HTTPClientConfig.Headers[k] = configopaque.String(v) + cfg.ClientConfig.Headers[k] = configopaque.String(v) } - cfg.HTTPClientConfig.Headers["test_header_"] = configopaque.String(tt.name) + cfg.ClientConfig.Headers["test_header_"] = configopaque.String(tt.name) cfg.AccessToken = configopaque.String(fromHeaders) cfg.AccessTokenPassthrough = tt.accessTokenPassthrough sfxExp, err := NewFactory().CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) @@ -441,9 +441,9 @@ func TestNewEventExporter(t *testing.T) { assert.Nil(t, got) cfg := &Config{ - AccessToken: "someToken", - Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + AccessToken: "someToken", + Realm: "xyz", + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, } got, err = newEventExporter(cfg, exportertest.NewNopCreateSettings()) @@ -557,7 +557,7 @@ func TestConsumeEventData(t *testing.T) { assert.NoError(t, err) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 1 * time.Second, Headers: map[string]configopaque.String{"test_header_": "test"}, }, diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index f6d573212112e..1410dd452a2b8 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -54,7 +54,7 @@ func createDefaultConfig() component.Config { return &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, MaxIdleConns: &maxConnCount, MaxIdleConnsPerHost: &maxConnCount, @@ -88,17 +88,17 @@ func createTracesExporter( cfg := eCfg.(*Config) corrCfg := cfg.Correlation - if corrCfg.HTTPClientConfig.Endpoint == "" { + if corrCfg.ClientConfig.Endpoint == "" { apiURL, err := cfg.getAPIURL() if err != nil { return nil, fmt.Errorf("unable to create API URL: %w", err) } - corrCfg.HTTPClientConfig.Endpoint = apiURL.String() + corrCfg.ClientConfig.Endpoint = apiURL.String() } if cfg.AccessToken == "" { return nil, errors.New("access_token is required") } - set.Logger.Info("Correlation tracking enabled", zap.String("endpoint", corrCfg.HTTPClientConfig.Endpoint)) + set.Logger.Info("Correlation tracking enabled", zap.String("endpoint", corrCfg.ClientConfig.Endpoint)) tracker := correlation.NewTracker(corrCfg, cfg.AccessToken, set) return exporterhelper.NewTracesExporter( diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 9b025e5227114..5d811319529da 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -102,7 +102,7 @@ func TestCreateMetricsExporter_CustomConfig(t *testing.T) { config := &Config{ AccessToken: "testToken", Realm: "us1", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 2 * time.Second, Headers: map[string]configopaque.String{ "added-entry": "added value", diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index d5edbd4f5c493..552b0166f2cb3 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -16,16 +16,16 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 1dbba57c7e083..7e233b0d2ab94 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -111,44 +111,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/signalfxexporter/internal/correlation/config.go b/exporter/signalfxexporter/internal/correlation/config.go index d3462b37d9373..72e20ffa6854f 100644 --- a/exporter/signalfxexporter/internal/correlation/config.go +++ b/exporter/signalfxexporter/internal/correlation/config.go @@ -17,7 +17,7 @@ import ( // DefaultConfig returns default configuration correlation values. func DefaultConfig() *Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 5 * time.Second}, + ClientConfig: confighttp.ClientConfig{Timeout: 5 * time.Second}, StaleServiceTimeout: 5 * time.Minute, SyncAttributes: map[string]string{ conventions.AttributeK8SPodUID: conventions.AttributeK8SPodUID, @@ -36,8 +36,8 @@ func DefaultConfig() *Config { // Config defines configuration for correlation via traces. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - correlations.Config `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + correlations.Config `mapstructure:",squash"` // How long to wait after a trace span's service name is last seen before // uncorrelating that service. @@ -47,11 +47,11 @@ type Config struct { } func (c *Config) validate() error { - if c.HTTPClientConfig.Endpoint == "" { + if c.ClientConfig.Endpoint == "" { return errors.New("`correlation.endpoint` not specified") } - _, err := url.Parse(c.HTTPClientConfig.Endpoint) + _, err := url.Parse(c.ClientConfig.Endpoint) if err != nil { return err } diff --git a/exporter/signalfxexporter/internal/correlation/config_test.go b/exporter/signalfxexporter/internal/correlation/config_test.go index 60961ccb0ab89..78e4ec71846f8 100644 --- a/exporter/signalfxexporter/internal/correlation/config_test.go +++ b/exporter/signalfxexporter/internal/correlation/config_test.go @@ -12,7 +12,7 @@ import ( func TestValidConfig(t *testing.T) { config := DefaultConfig() - config.HTTPClientConfig.Endpoint = "https://localhost" + config.ClientConfig.Endpoint = "https://localhost" require.NoError(t, config.validate()) } @@ -22,7 +22,7 @@ func TestInvalidConfig(t *testing.T) { require.Error(t, noEndpointErr) invalid = Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ":123:456"}, + ClientConfig: confighttp.ClientConfig{Endpoint: ":123:456"}, } invalidURLErr := invalid.validate() require.Error(t, invalidURLErr) diff --git a/exporter/signalfxexporter/internal/correlation/correlation.go b/exporter/signalfxexporter/internal/correlation/correlation.go index ec4d4eae8dfbe..223dd04b52613 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation.go +++ b/exporter/signalfxexporter/internal/correlation/correlation.go @@ -51,9 +51,9 @@ func NewTracker(cfg *Config, accessToken configopaque.String, params exporter.Cr func newCorrelationClient(cfg *Config, accessToken configopaque.String, params exporter.CreateSettings, host component.Host) ( *correlationContext, error, ) { - corrURL, err := url.Parse(cfg.HTTPClientConfig.Endpoint) + corrURL, err := url.Parse(cfg.ClientConfig.Endpoint) if err != nil { - return nil, fmt.Errorf("failed to parse correlation endpoint URL %q: %w", cfg.HTTPClientConfig.Endpoint, err) + return nil, fmt.Errorf("failed to parse correlation endpoint URL %q: %w", cfg.ClientConfig.Endpoint, err) } httpClient, err := cfg.ToClient(host, params.TelemetrySettings) diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index 398ad7567dab9..4ba47000d3bfb 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -54,7 +54,7 @@ func TestTrackerStart(t *testing.T) { { name: "invalid http client settings fails", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/skywalkingexporter/config.go b/exporter/skywalkingexporter/config.go index f0354ab596986..dbe20d0c43bf0 100644 --- a/exporter/skywalkingexporter/config.go +++ b/exporter/skywalkingexporter/config.go @@ -14,7 +14,7 @@ import ( // Config defines configuration for SkyWalking exporter. type Config struct { - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 689e3fcc8e02e..3f53ff4356bc2 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 10 * time.Second, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", @@ -102,7 +102,7 @@ func TestLoadConfig(t *testing.T) { func TestValidate(t *testing.T) { c1 := &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumStreams: 3, @@ -110,7 +110,7 @@ func TestValidate(t *testing.T) { err := c1.Validate() assert.Error(t, err) c2 := &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumStreams: 0, diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index 5578af1a89372..61f1758e8d32a 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -30,7 +30,7 @@ func createDefaultConfig() component.Config { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ // We almost read 0 bytes, so no need to tune ReadBufferSize. WriteBufferSize: 512 * 1024, }, diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index b6db58283d42a..e5f5880e30156 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -37,7 +37,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -49,7 +49,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -63,7 +63,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "gzip", }, @@ -73,7 +73,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "unknown compression", }, @@ -98,7 +98,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -113,7 +113,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index a62a257217ffd..d3303bfcbd637 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -7,16 +7,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index fd1bef26ff9b6..10e7974539ca7 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -123,46 +123,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/skywalkingexporter/skywalking.go b/exporter/skywalkingexporter/skywalking.go index 17a3cdafd0ae5..a61b761fde2ff 100644 --- a/exporter/skywalkingexporter/skywalking.go +++ b/exporter/skywalkingexporter/skywalking.go @@ -50,7 +50,7 @@ func newSwExporter(_ context.Context, cfg *Config, settings component.TelemetryS metadata: metadata.New(nil), settings: settings, } - for k, v := range cfg.GRPCClientSettings.Headers { + for k, v := range cfg.ClientConfig.Headers { oce.metadata.Set(k, string(v)) } return oce @@ -58,7 +58,7 @@ func newSwExporter(_ context.Context, cfg *Config, settings component.TelemetryS // start creates the gRPC client Connection func (oce *swExporter) start(ctx context.Context, host component.Host) error { - clientConn, err := oce.cfg.GRPCClientSettings.ToClientConn(ctx, host, oce.settings) + clientConn, err := oce.cfg.ClientConfig.ToClientConn(ctx, host, oce.settings) if err != nil { return err } diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index aefcfba68f7f1..a62aff28ffbff 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -126,7 +126,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan NumConsumers: 1, QueueSize: 1000, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index 2f7b38f7aba4c..cebb52485bb08 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -31,7 +31,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler := initializeGRPCTestServer(t, grpc.MaxConcurrentStreams(10)) tt := &Config{ NumStreams: 10, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -104,7 +104,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler2 := initializeGRPCTestServerMetric(t, grpc.MaxConcurrentStreams(10)) tt = &Config{ NumStreams: 10, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/splunkhecexporter/client.go b/exporter/splunkhecexporter/client.go index f5c8884bd8850..e8d1748f520c2 100644 --- a/exporter/splunkhecexporter/client.go +++ b/exporter/splunkhecexporter/client.go @@ -664,7 +664,7 @@ func checkHecHealth(ctx context.Context, client *http.Client, healthCheckURL *ur func buildHTTPClient(config *Config, host component.Host, telemetrySettings component.TelemetrySettings) (*http.Client, error) { // we handle compression explicitly. - config.HTTPClientConfig.Compression = "" + config.ClientConfig.Compression = "" return config.ToClient(host, telemetrySettings) } diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 019743d648837..36a8b1a717837 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -214,7 +214,7 @@ func runMetricsExport(cfg *Config, metrics pmetric.Metrics, expectedBatchesNum i } factory := NewFactory() - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.Token = "1234-1234" cfg.UseMultiMetricFormat = useMultiMetricsFormat @@ -266,7 +266,7 @@ func runTraceExport(testConfig *Config, traces ptrace.Traces, expectedBatchesNum factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.DisableCompression = testConfig.DisableCompression cfg.MaxContentLengthTraces = testConfig.MaxContentLengthTraces cfg.Token = "1234-1234" @@ -328,7 +328,7 @@ func runLogExport(cfg *Config, ld plog.Logs, expectedBatchesNum int, t *testing. panic(err) } - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.Token = "1234-1234" rr := make(chan receivedRequest) @@ -1292,7 +1292,7 @@ func TestErrorReceived(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1347,7 +1347,7 @@ func TestInvalidURL(t *testing.T) { cfg.QueueSettings.Enabled = false // Disable retries to not wait too much time for the return error. cfg.BackOffConfig.Enabled = false - cfg.HTTPClientConfig.Endpoint = "ftp://example.com:134" + cfg.ClientConfig.Endpoint = "ftp://example.com:134" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -1381,7 +1381,7 @@ func TestHeartbeatStartupFailed(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1419,7 +1419,7 @@ func TestHeartbeatStartupPass_Disabled(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1454,7 +1454,7 @@ func TestHeartbeatStartupPass(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false diff --git a/exporter/splunkhecexporter/config.go b/exporter/splunkhecexporter/config.go index f8a0886dd849c..8eeaee009cec3 100644 --- a/exporter/splunkhecexporter/config.go +++ b/exporter/splunkhecexporter/config.go @@ -64,7 +64,7 @@ type HecTelemetry struct { // Config defines configuration for Splunk exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -137,7 +137,7 @@ type Config struct { func (cfg *Config) getURL() (out *url.URL, err error) { - out, err = url.Parse(cfg.HTTPClientConfig.Endpoint) + out, err = url.Parse(cfg.ClientConfig.Endpoint) if err != nil { return out, err } @@ -153,7 +153,7 @@ func (cfg *Config) Validate() error { if !cfg.LogDataEnabled && !cfg.ProfilingDataEnabled { return errors.New(`either "log_data_enabled" or "profiling_data_enabled" has to be true`) } - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New(`requires a non-empty "endpoint"`) } _, err := cfg.getURL() diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index 56cfbf69e3b26..8f6c7eeb75907 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. defaultCfg := createDefaultConfig().(*Config) defaultCfg.Token = "00000000-0000-0000-0000-0000000000000" - defaultCfg.HTTPClientConfig.Endpoint = "https://splunk:8088/services/collector" + defaultCfg.ClientConfig.Endpoint = "https://splunk:8088/services/collector" hundred := 100 idleConnTimeout := 10 * time.Second @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { MaxContentLengthLogs: 2 * 1024 * 1024, MaxContentLengthMetrics: 2 * 1024 * 1024, MaxContentLengthTraces: 2 * 1024 * 1024, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Endpoint: "https://splunk:8088/services/collector", TLSSetting: configtls.TLSClientSetting{ @@ -149,7 +149,7 @@ func TestConfig_Validate(t *testing.T) { name: "bad url", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "cache_object:foo/bar" + cfg.ClientConfig.Endpoint = "cache_object:foo/bar" cfg.Token = "foo" return cfg }(), @@ -159,7 +159,7 @@ func TestConfig_Validate(t *testing.T) { name: "missing token", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://example.com" + cfg.ClientConfig.Endpoint = "http://example.com" return cfg }(), wantErr: "requires a non-empty \"token\"", @@ -168,7 +168,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for logs", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthLogs = maxContentLengthLogsLimit + 1 cfg.Token = "foo" return cfg @@ -179,7 +179,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for metrics", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthMetrics = maxContentLengthMetricsLimit + 1 cfg.Token = "foo" return cfg @@ -190,7 +190,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for traces", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthTraces = maxContentLengthTracesLimit + 1 cfg.Token = "foo" return cfg @@ -201,7 +201,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default event-size", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxEventSize = maxMaxEventSize + 1 cfg.Token = "foo" return cfg diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 2fb1070e3c3b6..b67baa3d4dce0 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -63,7 +63,7 @@ func createDefaultConfig() component.Config { return &Config{ LogDataEnabled: true, ProfilingDataEnabled: true, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, IdleConnTimeout: &defaultIdleConnTimeout, MaxIdleConnsPerHost: &defaultMaxConns, diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index 0e7e43ffa6eab..0ae3358958b8f 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -22,7 +22,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -32,7 +32,7 @@ func TestCreateMetricsExporter(t *testing.T) { func TestCreateTracesExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -42,7 +42,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateLogsExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -54,7 +54,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter( @@ -65,7 +65,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { // Set values that don't have a valid default. cfg.Token = "testToken" - cfg.HTTPClientConfig.Endpoint = "https://example.com" + cfg.ClientConfig.Endpoint = "https://example.com" exp, err = factory.CreateMetricsExporter( context.Background(), params, cfg) @@ -78,7 +78,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { config := &Config{ Token: "testToken", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com:8000", }, } diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index bfd173c3dc2fa..3108feeb8d5eb 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -13,16 +13,16 @@ require ( github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -88,15 +88,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 2ccf53ef9d117..0803132d64437 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -179,44 +179,44 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/splunkhecexporter/integration_test.go b/exporter/splunkhecexporter/integration_test.go index e70e627e14d6b..26b108fc899af 100644 --- a/exporter/splunkhecexporter/integration_test.go +++ b/exporter/splunkhecexporter/integration_test.go @@ -232,7 +232,7 @@ func TestSplunkHecExporterEventsToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" @@ -281,7 +281,7 @@ func TestSplunkHecExporterEventsToSplunkNonDefaultIndex(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" @@ -326,7 +326,7 @@ func TestSplunkHecExporterMetricsToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = index @@ -362,7 +362,7 @@ func TestSplunkHecExporterTracesToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go index 401e4286600d4..568400ef74e73 100644 --- a/exporter/sumologicexporter/config.go +++ b/exporter/sumologicexporter/config.go @@ -15,7 +15,7 @@ import ( // Config defines configuration for Sumo Logic exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -60,9 +60,9 @@ type Config struct { Client string `mapstructure:"client"` } -// createDefaultHTTPClientConfig returns default http client settings -func createDefaultHTTPClientConfig() confighttp.HTTPClientConfig { - return confighttp.HTTPClientConfig{ +// createDefaultClientConfig returns default http client settings +func createDefaultClientConfig() confighttp.ClientConfig { + return confighttp.ClientConfig{ Timeout: defaultTimeout, } } @@ -148,7 +148,7 @@ func (cfg *Config) Validate() error { return fmt.Errorf("unexpected compression encoding: %s", cfg.CompressEncoding) } - if len(cfg.HTTPClientConfig.Endpoint) == 0 { + if len(cfg.ClientConfig.Endpoint) == 0 { return errors.New("endpoint is not set") } diff --git a/exporter/sumologicexporter/config_test.go b/exporter/sumologicexporter/config_test.go index bd3f2b84cfc68..8eca2feb0951e 100644 --- a/exporter/sumologicexporter/config_test.go +++ b/exporter/sumologicexporter/config_test.go @@ -24,7 +24,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "test_format", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -36,7 +36,7 @@ func TestConfigValidation(t *testing.T) { cfg: &Config{ LogFormat: "json", MetricFormat: "test_format", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -50,7 +50,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "test_format", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -63,7 +63,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, }, }, @@ -75,7 +75,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -92,7 +92,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index 36da50f8c2fdf..64347cc22313d 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -125,7 +125,7 @@ func newMetricsExporter( // start starts the exporter func (se *sumologicexporter) start(_ context.Context, host component.Host) (err error) { - client, err := se.config.HTTPClientConfig.ToClient(host, se.settings) + client, err := se.config.ClientConfig.ToClient(host, se.settings) if err != nil { return fmt.Errorf("failed to create HTTP Client: %w", err) } diff --git a/exporter/sumologicexporter/exporter_test.go b/exporter/sumologicexporter/exporter_test.go index 05b61ce780279..1ce54520b3734 100644 --- a/exporter/sumologicexporter/exporter_test.go +++ b/exporter/sumologicexporter/exporter_test.go @@ -35,7 +35,7 @@ func TestInitExporter(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -142,7 +142,7 @@ func TestInvalidSourceFormats(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -156,7 +156,7 @@ func TestInvalidHTTPCLient(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "test_endpoint", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return nil, errors.New("roundTripperException") diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index 8cbd8718b09a6..dadb64969feac 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -43,9 +43,9 @@ func createDefaultConfig() component.Config { Client: DefaultClient, GraphiteTemplate: DefaultGraphiteTemplate, - HTTPClientConfig: createDefaultHTTPClientConfig(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: qs, + ClientConfig: createDefaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: qs, } } diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 5842d37343a36..ebd1b21061085 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -38,7 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) { Client: "otelcol", GraphiteTemplate: "%{_metric_}", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.NewDefaultBackOffConfig(), diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 96784118ca98d..7b0838af72043 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -5,13 +5,13 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -45,17 +45,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 7ddbb171eefc6..b21596e1b119c 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -72,42 +72,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/sumologicexporter/sender.go b/exporter/sumologicexporter/sender.go index b144b1b0c5662..0b7f0b516ff9b 100644 --- a/exporter/sumologicexporter/sender.go +++ b/exporter/sumologicexporter/sender.go @@ -97,7 +97,7 @@ func (s *sender) send(ctx context.Context, pipeline PipelineType, body io.Reader if err != nil { return err } - req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.config.HTTPClientConfig.Endpoint, data) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.config.ClientConfig.Endpoint, data) if err != nil { return err } diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go index 23bc7d00b405a..8df51f664232c 100644 --- a/exporter/sumologicexporter/sender_test.go +++ b/exporter/sumologicexporter/sender_test.go @@ -42,7 +42,7 @@ func prepareSenderTest(t *testing.T, cb []func(w http.ResponseWriter, req *http. })) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: testServer.URL, Timeout: defaultTimeout, }, @@ -73,7 +73,7 @@ func prepareSenderTest(t *testing.T, cb []func(w http.ResponseWriter, req *http. s: newSender( cfg, &http.Client{ - Timeout: cfg.HTTPClientConfig.Timeout, + Timeout: cfg.ClientConfig.Timeout, }, f, sourceFormats{ @@ -474,7 +474,7 @@ func TestInvalidEndpoint(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" test.s.logBuffer = exampleLog() _, err := test.s.sendLogs(context.Background(), newFields(pcommon.NewMap())) @@ -485,7 +485,7 @@ func TestInvalidPostRequest(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = "" + test.s.config.ClientConfig.Endpoint = "" test.s.logBuffer = exampleLog() _, err := test.s.sendLogs(context.Background(), newFields(pcommon.NewMap())) @@ -496,7 +496,7 @@ func TestLogsBufferOverflow(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" log := exampleLog() flds := newFields(pcommon.NewMap()) @@ -766,7 +766,7 @@ func TestMetricsBufferOverflow(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" test.s.config.MetricFormat = PrometheusFormat test.s.config.MaxRequestBodySize = 1024 * 1024 * 1024 * 1024 metric := exampleIntMetric() diff --git a/exporter/syslogexporter/go.mod b/exporter/syslogexporter/go.mod index 49abcf24109d1..71b8a26644e17 100644 --- a/exporter/syslogexporter/go.mod +++ b/exporter/syslogexporter/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -27,11 +27,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect @@ -50,8 +50,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 diff --git a/exporter/syslogexporter/go.sum b/exporter/syslogexporter/go.sum index 027feeac87414..2d1202b37b9bd 100644 --- a/exporter/syslogexporter/go.sum +++ b/exporter/syslogexporter/go.sum @@ -62,30 +62,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 9cfdba02ddf55..0441c896c89f9 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.4 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -43,12 +43,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index c410c0f3a27ca..f8833ac608bde 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -74,30 +74,30 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854 h1:pP6g github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/zipkinexporter/config.go b/exporter/zipkinexporter/config.go index 0b8a475459596..5f18554fa174c 100644 --- a/exporter/zipkinexporter/config.go +++ b/exporter/zipkinexporter/config.go @@ -19,7 +19,7 @@ type Config struct { // Configures the exporter client. // The Endpoint to send the Zipkin trace data to (e.g.: http://some.url:9411/api/v2/spans). - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. Format string `mapstructure:"format"` @@ -30,7 +30,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New("endpoint required") } return nil diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index b9a1fa4b41d39..cd317d1605689 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://somedest:1234/api/v2/spans", WriteBufferSize: 524288, Timeout: 5 * time.Second, diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 68b2cd3862af1..d3d7f423f2262 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -33,13 +33,13 @@ func NewFactory() exporter.Factory { } func createDefaultConfig() component.Config { - defaultClientHTTPSettings := confighttp.NewDefaultHTTPClientConfig() + defaultClientHTTPSettings := confighttp.NewDefaultClientConfig() defaultClientHTTPSettings.Timeout = defaultTimeout defaultClientHTTPSettings.WriteBufferSize = 512 * 1024 return &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: defaultClientHTTPSettings, + ClientConfig: defaultClientHTTPSettings, Format: defaultFormat, DefaultServiceName: defaultServiceName, } diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 1b52cc14d11be..06ca7f10318ea 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -10,15 +10,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,16 +54,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 43d076cddc270..384b485e7d366 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -80,44 +80,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index f372f2b25880f..78a3b4994e392 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -32,7 +32,7 @@ type zipkinExporter struct { url string client *http.Client serializer zipkinreporter.SpanSerializer - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig settings component.TelemetrySettings } @@ -40,7 +40,7 @@ func createZipkinExporter(cfg *Config, settings component.TelemetrySettings) (*z ze := &zipkinExporter{ defaultServiceName: cfg.DefaultServiceName, url: cfg.Endpoint, - clientSettings: &cfg.HTTPClientConfig, + clientSettings: &cfg.ClientConfig, client: nil, settings: settings, } diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index 156c746bea34e..e7dba4a2f7688 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -48,7 +48,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { defer cst.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: cst.URL, }, Format: "json", @@ -66,7 +66,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } @@ -271,7 +271,7 @@ const zipkinSpansJSONJavaLibrary = ` func TestZipkinExporter_invalidFormat(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "1.2.3.4", }, Format: "foobar", @@ -295,7 +295,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { defer cst.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: cst.URL, }, Format: "proto", @@ -314,7 +314,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index d22fbdfdacee9..6752010e3ac5b 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,11 +6,11 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.7.0 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -39,8 +39,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 7ab6eab40620e..22b276e4232d0 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -62,20 +62,20 @@ github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8A github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 7b412913b960a..e6715673f09d3 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -39,10 +39,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 04160c1bb7ff3..5955e7296cd4e 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -59,24 +59,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 239b24808001f..7c608ff75db68 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 github.com/tg123/go-htpasswd v1.2.2 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index d3f7084972a9f..3a41ec0abce6f 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -54,23 +54,23 @@ github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6 github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 352c0973dd5b2..93ba02d9f9cff 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index d5bc18452a264..8c4c75d07befd 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/go.mod b/extension/encoding/go.mod index b9ec9a44074a2..461bf8100ed36 100644 --- a/extension/encoding/go.mod +++ b/extension/encoding/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod go 1.20 require ( - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -21,9 +21,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/extension/encoding/go.sum b/extension/encoding/go.sum index f861dec139c0e..4501262302486 100644 --- a/extension/encoding/go.sum +++ b/extension/encoding/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/jaegerencodingextension/go.mod b/extension/encoding/jaegerencodingextension/go.mod index 092975651a1ed..6766c32b33c4a 100644 --- a/extension/encoding/jaegerencodingextension/go.mod +++ b/extension/encoding/jaegerencodingextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/jaegerencodingextension/go.sum b/extension/encoding/jaegerencodingextension/go.sum index 07574c0280557..e09eba851a848 100644 --- a/extension/encoding/jaegerencodingextension/go.sum +++ b/extension/encoding/jaegerencodingextension/go.sum @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/jsonlogencodingextension/go.mod b/extension/encoding/jsonlogencodingextension/go.mod index ca26d77cea279..3f43d36a77e46 100644 --- a/extension/encoding/jsonlogencodingextension/go.mod +++ b/extension/encoding/jsonlogencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/jsonlogencodingextension/go.sum b/extension/encoding/jsonlogencodingextension/go.sum index 6f1f5f71099c0..213366dec28b9 100644 --- a/extension/encoding/jsonlogencodingextension/go.sum +++ b/extension/encoding/jsonlogencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/otlpencodingextension/go.mod b/extension/encoding/otlpencodingextension/go.mod index 19d08815345d6..e041a1674fae5 100644 --- a/extension/encoding/otlpencodingextension/go.mod +++ b/extension/encoding/otlpencodingextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/otlpencodingextension/go.sum b/extension/encoding/otlpencodingextension/go.sum index 6f1f5f71099c0..213366dec28b9 100644 --- a/extension/encoding/otlpencodingextension/go.sum +++ b/extension/encoding/otlpencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/textencodingextension/go.mod b/extension/encoding/textencodingextension/go.mod index 7b8976bd56e13..af51e025fe55b 100644 --- a/extension/encoding/textencodingextension/go.mod +++ b/extension/encoding/textencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,7 +37,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum index 6f1f5f71099c0..213366dec28b9 100644 --- a/extension/encoding/textencodingextension/go.sum +++ b/extension/encoding/textencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/zipkinencodingextension/go.mod b/extension/encoding/zipkinencodingextension/go.mod index e200291c5a45c..68baaebdb249d 100644 --- a/extension/encoding/zipkinencodingextension/go.mod +++ b/extension/encoding/zipkinencodingextension/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,9 +40,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/zipkinencodingextension/go.sum b/extension/encoding/zipkinencodingextension/go.sum index bc9d40982ab70..5375dab7c48d1 100644 --- a/extension/encoding/zipkinencodingextension/go.sum +++ b/extension/encoding/zipkinencodingextension/go.sum @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index c028c1e2be785..a3e895fc5b958 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index e7c613290fbcf..9320eb36a85c8 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -50,21 +50,21 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/healthcheckextension/README.md b/extension/healthcheckextension/README.md index e4cd0bfc47087..0c31b7afd93d6 100644 --- a/extension/healthcheckextension/README.md +++ b/extension/healthcheckextension/README.md @@ -40,7 +40,7 @@ processors in the future. The following settings are required: -- `endpoint` (default = 0.0.0.0:13133): Address to publish the health check status. For full list of `HTTPServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The `component.UseLocalHostAsDefaultHost` feature gate changes this to localhost:13133. This will become the default in a future release. +- `endpoint` (default = 0.0.0.0:13133): Address to publish the health check status. For full list of `ServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The `component.UseLocalHostAsDefaultHost` feature gate changes this to localhost:13133. This will become the default in a future release. - `path` (default = "/"): Specifies the path to be configured for the health check server. - `response_body` (default = ""): Specifies a static body that overrides the default response returned by the health check service. - `check_collector_pipeline:` (optional): Settings of collector pipeline health check diff --git a/extension/healthcheckextension/config.go b/extension/healthcheckextension/config.go index dce43aa13f5db..cd9526d7f21f8 100644 --- a/extension/healthcheckextension/config.go +++ b/extension/healthcheckextension/config.go @@ -25,7 +25,7 @@ type ResponseBodySettings struct { // Config has the configuration for the extension enabling the health check // extension, used to report the health status of the service. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // Path represents the path the health check service will serve. // The default path is "/". diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 5896d50873355..16729c019b64a 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index 85ad8a1204c8d..0ebbd1726b782 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -28,7 +28,7 @@ func NewFactory() extension.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/healthcheckextension/factory_test.go b/extension/healthcheckextension/factory_test.go index 3b9d92da3c8fc..e0c3a83982d13 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/extension/healthcheckextension/factory_test.go @@ -19,7 +19,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:13133", }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 3951983c5c33b..e9ce87f3a054f 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,16 +44,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index fc60584845ed1..231eb54c7a333 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -105,36 +105,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/healthcheckextension/healthcheckextension_test.go b/extension/healthcheckextension/healthcheckextension_test.go index 1e1f4c26a4136..eb094ad82a09e 100644 --- a/extension/healthcheckextension/healthcheckextension_test.go +++ b/extension/healthcheckextension/healthcheckextension_test.go @@ -47,7 +47,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -74,7 +74,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomizedPathWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -97,7 +97,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithBothCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -124,7 +124,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithHealthyCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -151,7 +151,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithUnhealthyCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -178,7 +178,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -219,7 +219,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomPathWithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -260,7 +260,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomStaticResponseBodyWithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -353,7 +353,7 @@ func TestHealthCheckExtensionPortAlreadyInUse(t *testing.T) { defer ln.Close() config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: endpoint, }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -366,7 +366,7 @@ func TestHealthCheckExtensionPortAlreadyInUse(t *testing.T) { func TestHealthCheckMultipleStarts(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -384,7 +384,7 @@ func TestHealthCheckMultipleStarts(t *testing.T) { func TestHealthCheckMultipleShutdowns(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -401,7 +401,7 @@ func TestHealthCheckMultipleShutdowns(t *testing.T) { func TestHealthCheckShutdownWithoutStart(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/httpforwarder/config.go b/extension/httpforwarder/config.go index 13a8a4c83927e..d4e3fc80805c5 100644 --- a/extension/httpforwarder/config.go +++ b/extension/httpforwarder/config.go @@ -11,8 +11,8 @@ import ( type Config struct { // Ingress holds config settings for HTTP server listening for requests. - Ingress confighttp.HTTPServerConfig `mapstructure:"ingress"` + Ingress confighttp.ServerConfig `mapstructure:"ingress"` // Egress holds config settings to use for forwarded requests. - Egress confighttp.HTTPClientConfig `mapstructure:"egress"` + Egress confighttp.ClientConfig `mapstructure:"egress"` } diff --git a/extension/httpforwarder/config_test.go b/extension/httpforwarder/config_test.go index 8d98026619bda..27fb2c5604648 100644 --- a/extension/httpforwarder/config_test.go +++ b/extension/httpforwarder/config_test.go @@ -34,10 +34,10 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: "http://localhost:7070", }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Endpoint: "http://target/", Headers: map[string]configopaque.String{ "otel_http_forwarder": "dev", diff --git a/extension/httpforwarder/extension_test.go b/extension/httpforwarder/extension_test.go index 6cecd86f005d9..44854174cc7a3 100644 --- a/extension/httpforwarder/extension_test.go +++ b/extension/httpforwarder/extension_test.go @@ -47,7 +47,7 @@ func TestExtension(t *testing.T) { { name: "No additional headers", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, }, @@ -68,10 +68,10 @@ func TestExtension(t *testing.T) { { name: "With additional headers", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -90,10 +90,10 @@ func TestExtension(t *testing.T) { { name: "Error code from backend", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -110,10 +110,10 @@ func TestExtension(t *testing.T) { { name: "Error making request at forwarder", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -130,7 +130,7 @@ func TestExtension(t *testing.T) { { name: "Invalid config - HTTP Client creation fails", config: &Config{ - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -145,7 +145,7 @@ func TestExtension(t *testing.T) { { name: "Error on Startup", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: "invalid", // to mock error setting up listener. }, }, diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index 1f5046f45137e..f8f28d79cc88b 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -29,10 +29,10 @@ func NewFactory() extension.Factory { } func createDefaultConfig() component.Config { - httpClientSettings := confighttp.NewDefaultHTTPClientConfig() + httpClientSettings := confighttp.NewDefaultClientConfig() httpClientSettings.Timeout = 10 * time.Second return &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: defaultEndpoint, }, Egress: httpClientSettings, diff --git a/extension/httpforwarder/factory_test.go b/extension/httpforwarder/factory_test.go index d86dd84d6e0f1..7207434bac50d 100644 --- a/extension/httpforwarder/factory_test.go +++ b/extension/httpforwarder/factory_test.go @@ -39,13 +39,13 @@ func TestFactory(t *testing.T) { }, { name: "Invalid config", - config: &Config{Egress: confighttp.HTTPClientConfig{Endpoint: "123.456.7.89:9090"}}, + config: &Config{Egress: confighttp.ClientConfig{Endpoint: "123.456.7.89:9090"}}, wantErr: true, wantErrMessage: "enter a valid URL for 'egress.endpoint': parse \"123.456.7.89:9090\": first path segment in URL cannot", }, { name: "Valid config", - config: &Config{Egress: confighttp.HTTPClientConfig{Endpoint: "localhost:9090"}}, + config: &Config{Egress: confighttp.ClientConfig{Endpoint: "localhost:9090"}}, }, } for _, test := range tests { diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 798adae137081..4bdfc20963058 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,14 +42,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 70898f07438e1..1d8fd64ea97b7 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/jaegerremotesampling/config.go b/extension/jaegerremotesampling/config.go index 3d244429f4b7b..ae7520aaca155 100644 --- a/extension/jaegerremotesampling/config.go +++ b/extension/jaegerremotesampling/config.go @@ -21,8 +21,8 @@ var ( // Config has the configuration for the extension enabling the health check // extension, used to report the health status of the service. type Config struct { - *confighttp.HTTPServerConfig `mapstructure:"http"` - *configgrpc.GRPCServerSettings `mapstructure:"grpc"` + HTTPServerConfig *confighttp.ServerConfig `mapstructure:"http"` + GRPCServerConfig *configgrpc.ServerConfig `mapstructure:"grpc"` // Source configures the source for the strategies file. One of `remote` or `file` has to be specified. Source Source `mapstructure:"source"` @@ -30,7 +30,7 @@ type Config struct { type Source struct { // Remote defines the remote location for the file - Remote *configgrpc.GRPCClientSettings `mapstructure:"remote"` + Remote *configgrpc.ClientConfig `mapstructure:"remote"` // File specifies a local file as the strategies source File string `mapstructure:"file"` @@ -43,7 +43,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPServerConfig == nil && cfg.GRPCServerSettings == nil { + if cfg.HTTPServerConfig == nil && cfg.GRPCServerConfig == nil { return errAtLeastOneProtocol } diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 43174721268e8..ca175bc836ab2 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -29,13 +29,13 @@ func TestLoadConfig(t *testing.T) { { id: component.NewID(metadata.Type), expected: &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, Source: Source{ - Remote: &configgrpc.GRPCClientSettings{ + Remote: &configgrpc.ClientConfig{ Endpoint: "jaeger-collector:14250", }, }, @@ -44,8 +44,8 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, @@ -86,16 +86,16 @@ func TestValidate(t *testing.T) { { desc: "no sources", cfg: Config{ - GRPCServerSettings: &configgrpc.GRPCServerSettings{}, + GRPCServerConfig: &configgrpc.ServerConfig{}, }, expected: errNoSources, }, { desc: "too many sources", cfg: Config{ - GRPCServerSettings: &configgrpc.GRPCServerSettings{}, + GRPCServerConfig: &configgrpc.ServerConfig{}, Source: Source{ - Remote: &configgrpc.GRPCClientSettings{}, + Remote: &configgrpc.ClientConfig{}, File: "/tmp/some-file", }, }, diff --git a/extension/jaegerremotesampling/extension.go b/extension/jaegerremotesampling/extension.go index 663a6a14d927f..0b3577a7d270d 100644 --- a/extension/jaegerremotesampling/extension.go +++ b/extension/jaegerremotesampling/extension.go @@ -85,8 +85,8 @@ func (jrse *jrsExtension) Start(ctx context.Context, host component.Host) error } } - if jrse.cfg.GRPCServerSettings != nil { - grpcServer, err := internal.NewGRPC(jrse.telemetry, *jrse.cfg.GRPCServerSettings, jrse.samplingStore) + if jrse.cfg.GRPCServerConfig != nil { + grpcServer, err := internal.NewGRPC(jrse.telemetry, *jrse.cfg.GRPCServerConfig, jrse.samplingStore) if err != nil { return fmt.Errorf("error while creating the gRPC server: %w", err) } diff --git a/extension/jaegerremotesampling/extension_test.go b/extension/jaegerremotesampling/extension_test.go index 6e7acf235d17a..abb8b243b2527 100644 --- a/extension/jaegerremotesampling/extension_test.go +++ b/extension/jaegerremotesampling/extension_test.go @@ -97,9 +97,9 @@ func TestRemote(t *testing.T) { // create the config, pointing to the mock server cfg := testConfig() - cfg.GRPCServerSettings.NetAddr.Endpoint = "127.0.0.1:0" + cfg.GRPCServerConfig.NetAddr.Endpoint = "127.0.0.1:0" cfg.Source.ReloadInterval = tc.reloadInterval - cfg.Source.Remote = &configgrpc.GRPCClientSettings{ + cfg.Source.Remote = &configgrpc.ClientConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", lis.Addr().(*net.TCPAddr).Port), TLSSetting: configtls.TLSClientSetting{ Insecure: true, // test only @@ -164,6 +164,6 @@ func (s *samplingServer) GetSamplingStrategy(ctx context.Context, params *api_v2 func testConfig() *Config { cfg := createDefaultConfig().(*Config) cfg.HTTPServerConfig.Endpoint = "127.0.0.1:5778" - cfg.GRPCServerSettings.NetAddr.Endpoint = "127.0.0.1:14250" + cfg.GRPCServerConfig.NetAddr.Endpoint = "127.0.0.1:14250" return cfg } diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 9123dee0e1dec..78d1b30ba6149 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -31,10 +31,10 @@ func NewFactory() extension.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{ + HTTPServerConfig: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(5778), }, - GRPCServerSettings: &configgrpc.GRPCServerSettings{ + GRPCServerConfig: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(14250), Transport: "tcp", diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index e8fb9c0484d65..4c0dfd0ad70f3 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -18,8 +18,8 @@ import ( func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index aec7ffa5532c4..f7bf201433e6b 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -8,15 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -62,13 +62,13 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.18.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 656023e7c340c..d1a8561c0050f 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -113,39 +113,39 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/extension/jaegerremotesampling/internal/grpc.go b/extension/jaegerremotesampling/internal/grpc.go index 97f44efb74d53..9d672e56e5726 100644 --- a/extension/jaegerremotesampling/internal/grpc.go +++ b/extension/jaegerremotesampling/internal/grpc.go @@ -33,7 +33,7 @@ type grpcServer interface { // NewGRPC returns a new sampling gRPC Server. func NewGRPC( telemetry component.TelemetrySettings, - settings configgrpc.GRPCServerSettings, + settings configgrpc.ServerConfig, strategyStore strategystore.StrategyStore, ) (*SamplingGRPCServer, error) { if strategyStore == nil { @@ -50,7 +50,7 @@ func NewGRPC( // SamplingGRPCServer implements component.Component to make the life cycle easy to manage. type SamplingGRPCServer struct { telemetry component.TelemetrySettings - settings configgrpc.GRPCServerSettings + settings configgrpc.ServerConfig strategyStore strategystore.StrategyStore grpcServer grpcServer diff --git a/extension/jaegerremotesampling/internal/grpc_test.go b/extension/jaegerremotesampling/internal/grpc_test.go index 9d93aff32fd88..6c95df005e14c 100644 --- a/extension/jaegerremotesampling/internal/grpc_test.go +++ b/extension/jaegerremotesampling/internal/grpc_test.go @@ -17,14 +17,14 @@ import ( ) func TestMissingClientConfigManagerGRPC(t *testing.T) { - s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), configgrpc.GRPCServerSettings{}, nil) + s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), configgrpc.ServerConfig{}, nil) assert.Equal(t, errMissingStrategyStore, err) assert.Nil(t, s) } func TestStartAndStopGRPC(t *testing.T) { // prepare - srvSettings := configgrpc.GRPCServerSettings{ + srvSettings := configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "127.0.0.1:0", Transport: "tcp", diff --git a/extension/jaegerremotesampling/internal/http.go b/extension/jaegerremotesampling/internal/http.go index 05487f67a9480..b376723c3fe06 100644 --- a/extension/jaegerremotesampling/internal/http.go +++ b/extension/jaegerremotesampling/internal/http.go @@ -25,7 +25,7 @@ var _ component.Component = (*SamplingHTTPServer)(nil) type SamplingHTTPServer struct { telemetry component.TelemetrySettings - settings confighttp.HTTPServerConfig + settings confighttp.ServerConfig strategyStore strategystore.StrategyStore mux *http.ServeMux @@ -33,7 +33,7 @@ type SamplingHTTPServer struct { shutdownWG *sync.WaitGroup } -func NewHTTP(telemetry component.TelemetrySettings, settings confighttp.HTTPServerConfig, strategyStore strategystore.StrategyStore) (*SamplingHTTPServer, error) { +func NewHTTP(telemetry component.TelemetrySettings, settings confighttp.ServerConfig, strategyStore strategystore.StrategyStore) (*SamplingHTTPServer, error) { if strategyStore == nil { return nil, errMissingStrategyStore } diff --git a/extension/jaegerremotesampling/internal/http_test.go b/extension/jaegerremotesampling/internal/http_test.go index 11c38e9358090..18bdb47364634 100644 --- a/extension/jaegerremotesampling/internal/http_test.go +++ b/extension/jaegerremotesampling/internal/http_test.go @@ -21,14 +21,14 @@ import ( ) func TestMissingClientConfigManagerHTTP(t *testing.T) { - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, nil) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, nil) assert.Equal(t, errMissingStrategyStore, err) assert.Nil(t, s) } func TestStartAndStopHTTP(t *testing.T) { // prepare - srvSettings := confighttp.HTTPServerConfig{ + srvSettings := confighttp.ServerConfig{ Endpoint: "127.0.0.1:0", } s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), srvSettings, &mockCfgMgr{}) @@ -53,7 +53,7 @@ func TestEndpointsAreWired(t *testing.T) { for _, tC := range testCases { t.Run(tC.desc, func(t *testing.T) { // prepare - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{ + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{ getSamplingStrategyFunc: func(ctx context.Context, serviceName string) (*api_v2.SamplingStrategyResponse, error) { return &api_v2.SamplingStrategyResponse{ ProbabilisticSampling: &api_v2.ProbabilisticSamplingStrategy{ @@ -87,7 +87,7 @@ func TestEndpointsAreWired(t *testing.T) { func TestServiceNameIsRequired(t *testing.T) { // prepare - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{}) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{}) require.NoError(t, err) require.NotNil(t, s) @@ -105,7 +105,7 @@ func TestServiceNameIsRequired(t *testing.T) { } func TestErrorFromClientConfigManager(t *testing.T) { - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{}) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{}) require.NoError(t, err) require.NotNil(t, s) diff --git a/extension/jaegerremotesampling/internal/remote_strategy_store.go b/extension/jaegerremotesampling/internal/remote_strategy_store.go index 1c0a052f33bdf..2f452ec364c3c 100644 --- a/extension/jaegerremotesampling/internal/remote_strategy_store.go +++ b/extension/jaegerremotesampling/internal/remote_strategy_store.go @@ -30,7 +30,7 @@ type grpcRemoteStrategyStore struct { // for service-specific outbound GetSamplingStrategy calls. func NewRemoteStrategyStore( conn *grpc.ClientConn, - grpcClientSettings *configgrpc.GRPCClientSettings, + grpcClientSettings *configgrpc.ClientConfig, reloadInterval time.Duration, ) (strategystore.StrategyStore, io.Closer) { cache := newNoopStrategyCache() diff --git a/extension/oauth2clientauthextension/extension_test.go b/extension/oauth2clientauthextension/extension_test.go index 3a8ed4892b79d..2e68687aeafdb 100644 --- a/extension/oauth2clientauthextension/extension_test.go +++ b/extension/oauth2clientauthextension/extension_test.go @@ -316,7 +316,7 @@ func TestFailContactingOAuth(t *testing.T) { assert.Contains(t, err.Error(), serverURL.String()) // Test for HTTP connections - setting := confighttp.HTTPClientConfig{ + setting := confighttp.ClientConfig{ Endpoint: "http://example.com/", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return oauth2Authenticator.roundTripper(next) diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index afbf041c179bc..ab6978ca2c7a6 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,13 +47,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 2b8734fc5a31d..04d3e94c91958 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -68,35 +68,35 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 9471bc73bb285..1b27f6827f8d6 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -68,8 +68,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index f62d7259ebeff..1781e074c1599 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -130,16 +130,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 2dff94f308fd5..dae0580d5da69 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/hashicorp/golang-lru v1.0.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index fa6d329560f33..a191944c997a6 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -57,16 +57,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/ecstaskobserver/config.go b/extension/observer/ecstaskobserver/config.go index 9fd9c23ef2095..7d3a0a218d849 100644 --- a/extension/observer/ecstaskobserver/config.go +++ b/extension/observer/ecstaskobserver/config.go @@ -17,7 +17,7 @@ const ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // RefreshInterval determines the frequency at which the observer // needs to poll for collecting new information about task containers. diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index f80d20f7d3bf0..4a9da20bf93be 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "with-endpoint"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://a.valid.url:1234/path", }, PortLabels: []string{"ECS_TASK_OBSERVER_PORT"}, diff --git a/extension/observer/ecstaskobserver/factory.go b/extension/observer/ecstaskobserver/factory.go index 271cf82bc0245..366b8635d38bd 100644 --- a/extension/observer/ecstaskobserver/factory.go +++ b/extension/observer/ecstaskobserver/factory.go @@ -74,7 +74,7 @@ func metadataProviderFromEndpoint(config *Config, settings component.TelemetrySe return nil, fmt.Errorf("failed to parse task metadata endpoint: %w", err) } - restClient, err := ecsutil.NewRestClient(*parsed, config.HTTPClientConfig, settings) + restClient, err := ecsutil.NewRestClient(*parsed, config.ClientConfig, settings) if err != nil { return nil, fmt.Errorf("failed to create ECS Task Observer rest client: %w", err) } diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 88e1378d08f1b..d01ce3f400dcc 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,16 +42,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index b487d65b9d697..5bd9a8faa3fbf 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -63,35 +63,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index fb6a2db9df22e..72d1ac6de850f 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 4700e85aac6fc..c2abc7b1a1c33 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -75,16 +75,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 87619950f2ec4..5814265241aeb 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -54,8 +54,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 14297bfe469f2..ab52b9089c87b 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -256,16 +256,16 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index f2f0d17e6c75c..9b93421775cd1 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index f2995f758d044..bb0a3c326a13a 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -59,21 +59,21 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/opampextension/go.mod b/extension/opampextension/go.mod index a54441d869c99..6135680860d66 100644 --- a/extension/opampextension/go.mod +++ b/extension/opampextension/go.mod @@ -7,13 +7,13 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/opampextension/go.sum b/extension/opampextension/go.sum index 5fd4a03ee66fa..e78f77732b632 100644 --- a/extension/opampextension/go.sum +++ b/extension/opampextension/go.sum @@ -61,22 +61,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 178608719af37..8056ab5c3e64a 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 839eb5c2ad96c..f7d3e344e86aa 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/remotetapextension/config.go b/extension/remotetapextension/config.go index ba46f12660f1c..a9942dc4977f6 100644 --- a/extension/remotetapextension/config.go +++ b/extension/remotetapextension/config.go @@ -9,12 +9,12 @@ import ( ) type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct } func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "127.0.0.1:11000", }, } diff --git a/extension/remotetapextension/extension.go b/extension/remotetapextension/extension.go index ce394243ac00a..b1722b7f249a1 100644 --- a/extension/remotetapextension/extension.go +++ b/extension/remotetapextension/extension.go @@ -31,7 +31,7 @@ func (s *remoteObserverExtension) Start(_ context.Context, host component.Host) } mux := http.NewServeMux() mux.Handle("/", http.FileServer(http.FS(htmlContent))) - s.server, err = s.config.HTTPServerConfig.ToServer(host, s.settings.TelemetrySettings, mux) + s.server, err = s.config.ServerConfig.ToServer(host, s.settings.TelemetrySettings, mux) if err != nil { return err } diff --git a/extension/remotetapextension/go.mod b/extension/remotetapextension/go.mod index 41ba6a5236548..df48ac1f1f911 100644 --- a/extension/remotetapextension/go.mod +++ b/extension/remotetapextension/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,16 +38,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/remotetapextension/go.sum b/extension/remotetapextension/go.sum index 70898f07438e1..1d8fd64ea97b7 100644 --- a/extension/remotetapextension/go.sum +++ b/extension/remotetapextension/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 141617615fc48..c46200fa36ac1 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.16.16 github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -46,8 +46,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 9bd301c3898b3..e8ed9d8304867 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -73,18 +73,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index e9a934a836583..933482c485f3a 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -30,9 +30,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index ddbc850405d64..49c96f14855c4 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index a7390f8605f80..7ebb612df80fe 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,10 +7,10 @@ require ( github.com/mattn/go-sqlite3 v1.14.20 github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.8 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,8 +45,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index fe3e9c84daa9e..a2483970724af 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -160,18 +160,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index 21a1347005b37..1b4c7fbefea85 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -39,16 +39,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index 222b61e753e1c..8ebc923e687e4 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -64,35 +64,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/go.mod b/go.mod index 929b936553cfc..486242f6b0cb2 100644 --- a/go.mod +++ b/go.mod @@ -169,22 +169,22 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d ) require ( @@ -623,25 +623,25 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/go.sum b/go.sum index 01143ee20c66a..ce56c096247a3 100644 --- a/go.sum +++ b/go.sum @@ -1574,76 +1574,76 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f h1:wQcpS+Mm42oaYDZ2YqqNc/bmxzeHUD2KzL7Vgx7pDj0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d h1:eONwZYONNf2uu7zSbv8PurEP+f+Cf/fWPx3gEw5zOVM= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 0c6aeac17d0f2..11f90edfd5152 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 50168a1c9bf02..0a4054f18d725 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -29,8 +29,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index ce014f8e62df8..91bb551d0ed9d 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go v1.50.7 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -23,9 +23,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index b11ed5e048ab4..b5ec87fd89f7e 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -45,14 +45,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/aws/ecsutil/client.go b/internal/aws/ecsutil/client.go index 38dabda7bf10e..116d2b0c70f9c 100644 --- a/internal/aws/ecsutil/client.go +++ b/internal/aws/ecsutil/client.go @@ -22,7 +22,7 @@ type Client interface { } // NewClientProvider creates the default rest client provider -func NewClientProvider(baseURL url.URL, clientSettings confighttp.HTTPClientConfig, host component.Host, settings component.TelemetrySettings) ClientProvider { +func NewClientProvider(baseURL url.URL, clientSettings confighttp.ClientConfig, host component.Host, settings component.TelemetrySettings) ClientProvider { return &defaultClientProvider{ baseURL: baseURL, clientSettings: clientSettings, @@ -38,7 +38,7 @@ type ClientProvider interface { type defaultClientProvider struct { baseURL url.URL - clientSettings confighttp.HTTPClientConfig + clientSettings confighttp.ClientConfig host component.Host settings component.TelemetrySettings } @@ -54,7 +54,7 @@ func (dcp *defaultClientProvider) BuildClient() (Client, error) { func defaultClient( baseURL url.URL, - clientSettings confighttp.HTTPClientConfig, + clientSettings confighttp.ClientConfig, host component.Host, settings component.TelemetrySettings, ) (*clientImpl, error) { diff --git a/internal/aws/ecsutil/client_test.go b/internal/aws/ecsutil/client_test.go index 8a0a3c2d62f6f..e478386ced394 100644 --- a/internal/aws/ecsutil/client_test.go +++ b/internal/aws/ecsutil/client_test.go @@ -36,7 +36,7 @@ func TestClient(t *testing.T) { func TestNewClientProvider(t *testing.T) { baseURL, _ := url.Parse("http://localhost:8080") - provider := NewClientProvider(*baseURL, confighttp.HTTPClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) + provider := NewClientProvider(*baseURL, confighttp.ClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) require.NotNil(t, provider) _, ok := provider.(*defaultClientProvider) require.True(t, ok) @@ -48,7 +48,7 @@ func TestNewClientProvider(t *testing.T) { func TestDefaultClient(t *testing.T) { endpoint, _ := url.Parse("http://localhost:8080") - client, err := defaultClient(*endpoint, confighttp.HTTPClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) + client, err := defaultClient(*endpoint, confighttp.ClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) require.NoError(t, err) require.NotNil(t, client.httpClient.Transport) require.Equal(t, "http://localhost:8080", client.baseURL.String()) diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index ef8abed841674..755491253f97e 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -36,18 +36,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 70898f07438e1..1d8fd64ea97b7 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/internal/aws/ecsutil/metadata_provider.go b/internal/aws/ecsutil/metadata_provider.go index 701355b6815ce..34b814aba2467 100644 --- a/internal/aws/ecsutil/metadata_provider.go +++ b/internal/aws/ecsutil/metadata_provider.go @@ -42,7 +42,7 @@ func NewDetectedTaskMetadataProvider(set component.TelemetrySettings) (MetadataP return nil, fmt.Errorf("unable to detect task metadata endpoint") } - clientSettings := confighttp.HTTPClientConfig{} + clientSettings := confighttp.ClientConfig{} client, err := NewRestClient(*endpoint, clientSettings, set) if err != nil { return nil, err diff --git a/internal/aws/ecsutil/rest_client.go b/internal/aws/ecsutil/rest_client.go index ed5266f0765f0..8ec8162b96e90 100644 --- a/internal/aws/ecsutil/rest_client.go +++ b/internal/aws/ecsutil/rest_client.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" ) -func NewRestClient(baseEndpoint url.URL, clientSettings confighttp.HTTPClientConfig, settings component.TelemetrySettings) (RestClient, error) { +func NewRestClient(baseEndpoint url.URL, clientSettings confighttp.ClientConfig, settings component.TelemetrySettings) (RestClient, error) { clientProvider := NewClientProvider(baseEndpoint, clientSettings, &nopHost{}, settings) client, err := clientProvider.BuildClient() diff --git a/internal/aws/ecsutil/rest_client_test.go b/internal/aws/ecsutil/rest_client_test.go index 6ba4a8c6df854..d971fa439e304 100644 --- a/internal/aws/ecsutil/rest_client_test.go +++ b/internal/aws/ecsutil/rest_client_test.go @@ -23,7 +23,7 @@ func (f *fakeClient) Get(path string) ([]byte, error) { func TestRestClient(t *testing.T) { u, _ := url.Parse("http://www.test.com") - rest, err := NewRestClient(*u, confighttp.HTTPClientConfig{}, componenttest.NewNopTelemetrySettings()) + rest, err := NewRestClient(*u, confighttp.ClientConfig{}, componenttest.NewNopTelemetrySettings()) require.NoError(t, err) require.NotNil(t, rest) } diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index d83691f74d8da..d3ea9cdbf44b5 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/zap v1.26.0 ) @@ -17,8 +17,8 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.14.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 53c6f964886ba..c696d9b97ef84 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -11,22 +11,29 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index b297bafac48bb..43b3edc1f16d2 100644 --- a/internal/aws/xray/go.mod +++ b/internal/aws/xray/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -24,9 +24,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/aws/xray/go.sum b/internal/aws/xray/go.sum index ffbc9ad8754ce..d564068a9000a 100644 --- a/internal/aws/xray/go.sum +++ b/internal/aws/xray/go.sum @@ -45,14 +45,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/common/go.mod b/internal/common/go.mod index 43a50085b401b..707848602aeee 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 54897502b80e5..7cf5cd9e55df8 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 35573ace01750..f96ee80b4a1cb 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -78,8 +78,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index d25ea4e1d91d6..fee9dc6b0c6fa 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -138,24 +138,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 3c0f0e04c2df3..d7a994f50d3a7 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -7,8 +7,8 @@ require ( github.com/DataDog/datadog-agent/pkg/trace v0.50.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -64,10 +64,10 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 3e39335fdf869..1648e1d55fb88 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -165,18 +165,18 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 5628124d4168a..db1280031e65b 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -45,7 +45,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index f14af2d76e41a..9a070aeb2e908 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -75,18 +75,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/kafka/go.mod b/internal/kafka/go.mod index ea419d0779b4e..842178344bbd7 100644 --- a/internal/kafka/go.mod +++ b/internal/kafka/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/stretchr/testify v1.8.4 github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -34,7 +34,8 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.15.0 // indirect diff --git a/internal/kafka/go.sum b/internal/kafka/go.sum index d93c09f9cb9ff..3a343a165d0aa 100644 --- a/internal/kafka/go.sum +++ b/internal/kafka/go.sum @@ -27,6 +27,7 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -45,8 +46,14 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= 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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -71,10 +78,13 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 7d44531d3af77..8ec5447942336 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 k8s.io/client-go v0.28.4 @@ -37,7 +37,7 @@ require ( github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index e502172bb2d90..479534a6d4500 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -140,6 +140,7 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -157,6 +158,9 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -171,7 +175,10 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -228,10 +235,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/internal/metadataproviders/go.mod b/internal/metadataproviders/go.mod index f5b2dc6d6c0e7..ca488b4e2738c 100644 --- a/internal/metadataproviders/go.mod +++ b/internal/metadataproviders/go.mod @@ -9,7 +9,7 @@ require ( github.com/hashicorp/consul/api v1.27.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 go.uber.org/goleak v1.3.0 diff --git a/internal/metadataproviders/go.sum b/internal/metadataproviders/go.sum index af345a00fe1ea..1a37d01ac6ad8 100644 --- a/internal/metadataproviders/go.sum +++ b/internal/metadataproviders/go.sum @@ -392,8 +392,8 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 599c1b37559fe..2eb29f1afa551 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) @@ -27,9 +27,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index af10395414eed..b982ccdab9782 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -47,14 +47,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 3978899db3b9d..5a223ac3181dc 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -27,12 +27,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 7df2ff341c2f2..607e286faf1c6 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -51,27 +51,27 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index 6f6f9b313482d..52cf4728164cb 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -10,9 +10,9 @@ require ( github.com/sijms/go-ora/v2 v2.8.6 github.com/snowflakedb/gosnowflake v1.7.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 ) @@ -84,10 +84,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/sqlquery/go.sum b/internal/sqlquery/go.sum index 554cdd09e397a..361083e9881ac 100644 --- a/internal/sqlquery/go.sum +++ b/internal/sqlquery/go.sum @@ -202,20 +202,20 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index b269d93b77c9a..d209a52f07fd0 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/build-tools/crosslink v0.12.0 go.opentelemetry.io/build-tools/issuegenerator v0.12.0 go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63 - go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 golang.org/x/tools v0.17.0 golang.org/x/vuln v1.0.3 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index a6e7853d64df3..12996b5047313 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -655,8 +655,8 @@ go.opentelemetry.io/build-tools/issuegenerator v0.12.0 h1:KRP7aSUR9JoqNwv+Pp595v go.opentelemetry.io/build-tools/issuegenerator v0.12.0/go.mod h1:G71Og7dZJoIC+MjuY1InQ/oeAOkM1S5Nv6CCnlOdqns= go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63 h1:/k1/akmYXP+ZRoHoNCbmLpluR7l1+Y+9mBL0kuIwjks= go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63/go.mod h1:EGWcKkk7JQzxREP7M23rWiRK+RZioVOFRdM1KW6pnJc= -go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f h1:vkmaJMsUknvG9/P8Ez6H+mHh1h7PjqeiLJgyh5chPrg= -go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PZfoFOWMKq9tFC6YQfiU5vG/Q4prdm05zwatfyQyY+Q= +go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d h1:LcVcdpUQMnGAmi+PysjDtJHQun+XuwXhUy51nf8SETk= +go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PZfoFOWMKq9tFC6YQfiU5vG/Q4prdm05zwatfyQyY+Q= go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 10931e6021dbb..007b1202672a8 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 0d1592126d38e..18314fbb808ff 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -30,10 +30,10 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 8009f41272322..9fe430309e935 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 2a9dca69a2b54..daaeb807784b2 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/experimentalmetricmetadata/go.mod b/pkg/experimentalmetricmetadata/go.mod index b429e5c1eeefa..f684728ead9d0 100644 --- a/pkg/experimentalmetricmetadata/go.mod +++ b/pkg/experimentalmetricmetadata/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/experimentalmetricmetadata/go.sum b/pkg/experimentalmetricmetadata/go.sum index 2a9dca69a2b54..daaeb807784b2 100644 --- a/pkg/experimentalmetricmetadata/go.sum +++ b/pkg/experimentalmetricmetadata/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/golden/go.mod b/pkg/golden/go.mod index 85bd300700fba..d06c529c37747 100644 --- a/pkg/golden/go.mod +++ b/pkg/golden/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/pkg/golden/go.sum b/pkg/golden/go.sum index ba49c7b478d45..1b33123f3631b 100644 --- a/pkg/golden/go.sum +++ b/pkg/golden/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 4fc2166d7674d..f0194b9a7d870 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -11,8 +11,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 27f65c7a3c79c..67c8129b8e8ac 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -69,14 +69,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/pdatatest/go.mod b/pkg/pdatatest/go.mod index 15770311231a8..a9d3dddd860b0 100644 --- a/pkg/pdatatest/go.mod +++ b/pkg/pdatatest/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/pdatatest/go.sum b/pkg/pdatatest/go.sum index ba49c7b478d45..1b33123f3631b 100644 --- a/pkg/pdatatest/go.sum +++ b/pkg/pdatatest/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/pdatautil/go.mod b/pkg/pdatautil/go.mod index d6978b1f36b7d..8c92f4c487d21 100644 --- a/pkg/pdatautil/go.mod +++ b/pkg/pdatautil/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/pdatautil/go.sum b/pkg/pdatautil/go.sum index f4ecbf2e9778a..16d418090a338 100644 --- a/pkg/pdatautil/go.sum +++ b/pkg/pdatautil/go.sum @@ -22,8 +22,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 2df0687ee4e2b..bbf429c49daa3 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) @@ -25,9 +25,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index ab107b1408687..ca11e178e5aaa 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -49,18 +49,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/sampling/go.mod b/pkg/sampling/go.mod index 34a2fc3d5df11..1d1c08b8b67b8 100644 --- a/pkg/sampling/go.mod +++ b/pkg/sampling/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/multierr v1.11.0 ) diff --git a/pkg/sampling/go.sum b/pkg/sampling/go.sum index 422eac3118e9a..b94cc94be195b 100644 --- a/pkg/sampling/go.sum +++ b/pkg/sampling/go.sum @@ -20,8 +20,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index aebb8823cec7d..b69f46739b8f8 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -15,14 +15,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 github.com/valyala/fastjson v1.6.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 @@ -57,9 +57,9 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index 00dcdca4ab244..58b8b4cf93550 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -87,28 +87,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/translator/azure/go.mod b/pkg/translator/azure/go.mod index 621da29dc79b9..233912242b284 100644 --- a/pkg/translator/azure/go.mod +++ b/pkg/translator/azure/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/relvacode/iso8601 v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/pkg/translator/azure/go.sum b/pkg/translator/azure/go.sum index 7d96f0b6cbc61..2f453c073ce21 100644 --- a/pkg/translator/azure/go.sum +++ b/pkg/translator/azure/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index df06183ca2b18..8c70e56f9a26e 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 7689ae871462c..02b5362d11e62 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -35,10 +35,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index b2203b8b3231b..0d0f97c21b2bb 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -11,8 +11,8 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index fce174bab0b43..b93daae4d0732 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -76,12 +76,12 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index e90ab7ae79427..f0d447f608f7b 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 google.golang.org/protobuf v1.32.0 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 98fbb64f73a54..1546a981f8b7d 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -74,10 +74,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 0374933c29e3f..a6f2cafd4ebe2 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index aedeb0c09f02f..d9a41e28a5b1e 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -33,10 +33,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 20551b3077014..7d25de68681a9 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,8 +8,8 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -23,7 +23,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index c095d7c9d35bd..eff531db02071 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -37,12 +37,12 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index c86ef869c5b73..d092ace85c00b 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 1e32003eb659f..69e9b18421371 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -43,8 +43,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/pkg/translator/skywalking/go.mod b/pkg/translator/skywalking/go.mod index af96873efb334..90ada580b2f08 100644 --- a/pkg/translator/skywalking/go.mod +++ b/pkg/translator/skywalking/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) diff --git a/pkg/translator/skywalking/go.sum b/pkg/translator/skywalking/go.sum index 279f0e5f15fa2..fd91f446c6846 100644 --- a/pkg/translator/skywalking/go.sum +++ b/pkg/translator/skywalking/go.sum @@ -80,10 +80,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 38a51dfa2d5b0..36d94eac3e002 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 0b74117b674c4..262ac44c4d3ca 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -37,10 +37,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 3bbf69d91d840..a4fd17b1a8f7a 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,9 +50,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 40a3aaadc359c..db099f2638019 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -75,24 +75,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 169d643c67b89..af3498a5cab87 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index a0dae83784302..a27d3c79b4fde 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 474a4623c8897..3ab49870b8cdc 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -83,10 +83,10 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 0530027d5b2a6..47fcaae9f80fc 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -171,28 +171,28 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/deltatocumulativeprocessor/go.mod b/processor/deltatocumulativeprocessor/go.mod index 3b44f2649323c..5d7f8a408d26a 100644 --- a/processor/deltatocumulativeprocessor/go.mod +++ b/processor/deltatocumulativeprocessor/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/delta go 1.20 require ( - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -24,8 +24,8 @@ 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 - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.20.0 // indirect diff --git a/processor/deltatocumulativeprocessor/go.sum b/processor/deltatocumulativeprocessor/go.sum index 7c676716db8c0..7946bcdb68a57 100644 --- a/processor/deltatocumulativeprocessor/go.sum +++ b/processor/deltatocumulativeprocessor/go.sum @@ -45,18 +45,18 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 0cb23037013e2..b56ca36d013b6 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index fab34e91971aa..5a07d3ff842bc 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index a5e5b4232c86b..0dd8824d8612e 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 @@ -51,10 +51,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 40a3aaadc359c..db099f2638019 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -75,24 +75,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 21f8137ea1a8c..d7b3c7e12b468 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index fab34e91971aa..5a07d3ff842bc 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 26d3fbda167b3..c76e89ea7feaa 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 9837e4bd6add4..9a3558688ca51 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -95,20 +95,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/intervalprocessor/go.mod b/processor/intervalprocessor/go.mod index 4b38ecd4fe43b..ffe966cc408d7 100644 --- a/processor/intervalprocessor/go.mod +++ b/processor/intervalprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/intervalprocessor/go.sum b/processor/intervalprocessor/go.sum index ec6bc93391aef..da30ceafb62ed 100644 --- a/processor/intervalprocessor/go.sum +++ b/processor/intervalprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 7bc4727c2149a..0936c30a11e5b 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -10,16 +10,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -83,17 +83,17 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 2614566a47abe..c398c5b193d9c 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -1223,48 +1223,48 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index bb79664f45a40..796f5ad0fbc89 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,10 +48,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index b5bfedbdb6a6a..6a0dbe6396e2d 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -74,26 +74,26 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index a1c8e38ba1096..378479cb76759 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index fab34e91971aa..5a07d3ff842bc 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index b89a701e5326c..0a41acfb8b87b 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index fab34e91971aa..5a07d3ff842bc 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 67917a57cd142..82cbc411ca296 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,14 +6,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,13 +58,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index a1e85b554af6f..0f0c75eae4898 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -133,39 +133,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index b35a100fec116..2215544faf325 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index fab34e91971aa..5a07d3ff842bc 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/remotetapprocessor/config.go b/processor/remotetapprocessor/config.go index df52f2bd1b702..2591b882582a5 100644 --- a/processor/remotetapprocessor/config.go +++ b/processor/remotetapprocessor/config.go @@ -14,7 +14,7 @@ import ( const defaultPort = 12001 type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // Limit is a float that indicates the maximum number of messages repeated // through the websocket by this processor in messages per second. Defaults to 1. @@ -23,7 +23,7 @@ type Config struct { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, Limit: 1, diff --git a/processor/remotetapprocessor/go.mod b/processor/remotetapprocessor/go.mod index cdccb0f189be3..daa6ef0ad72e0 100644 --- a/processor/remotetapprocessor/go.mod +++ b/processor/remotetapprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/remotetapprocessor/go.sum b/processor/remotetapprocessor/go.sum index 886d275deec97..944cea9878081 100644 --- a/processor/remotetapprocessor/go.sum +++ b/processor/remotetapprocessor/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/remotetapprocessor/processor.go b/processor/remotetapprocessor/processor.go index e730ac8b735a4..30b186a6c3e35 100644 --- a/processor/remotetapprocessor/processor.go +++ b/processor/remotetapprocessor/processor.go @@ -44,11 +44,11 @@ func newProcessor(settings processor.CreateSettings, config *Config) *wsprocesso func (w *wsprocessor) Start(_ context.Context, host component.Host) error { var err error var ln net.Listener - ln, err = w.config.HTTPServerConfig.ToListener() + ln, err = w.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", w.config.Endpoint, err) } - w.server, err = w.config.HTTPServerConfig.ToServer(host, w.telemetrySettings, websocket.Handler(w.handleConn)) + w.server, err = w.config.ServerConfig.ToServer(host, w.telemetrySettings, websocket.Handler(w.handleConn)) if err != nil { return err } diff --git a/processor/remotetapprocessor/server_test.go b/processor/remotetapprocessor/server_test.go index 61fde8d780359..66e7e1f756725 100644 --- a/processor/remotetapprocessor/server_test.go +++ b/processor/remotetapprocessor/server_test.go @@ -22,7 +22,7 @@ import ( func TestSocketConnectionLogs(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12001", }, } @@ -59,7 +59,7 @@ func TestSocketConnectionLogs(t *testing.T) { func TestSocketConnectionMetrics(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12002", }, } @@ -94,7 +94,7 @@ func TestSocketConnectionMetrics(t *testing.T) { func TestSocketConnectionTraces(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12003", }, } diff --git a/processor/resourcedetectionprocessor/config.go b/processor/resourcedetectionprocessor/config.go index 78ed1a6c9f9d7..8dd1c1f10c8b3 100644 --- a/processor/resourcedetectionprocessor/config.go +++ b/processor/resourcedetectionprocessor/config.go @@ -36,7 +36,7 @@ type Config struct { DetectorConfig DetectorConfig `mapstructure:",squash"` // HTTP client settings for the detector // Timeout default is 5s - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Attributes is an allowlist of attributes to add. // If a supplied attribute is not a valid attribute of a supplied detector it will be ignored. // Deprecated: Please use detector's resource_attributes config instead diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 16d51b0ae7d27..829e3f6accf95 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -27,7 +27,7 @@ import ( func TestLoadConfig(t *testing.T) { t.Parallel() - cfg := confighttp.NewDefaultHTTPClientConfig() + cfg := confighttp.NewDefaultClientConfig() cfg.Timeout = 2 * time.Second openshiftConfig := detectorCreateDefaultConfig() openshiftConfig.OpenShiftConfig = openshift.Config{ @@ -69,65 +69,65 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "openshift"), expected: &Config{ - Detectors: []string{"openshift"}, - DetectorConfig: openshiftConfig, - HTTPClientConfig: cfg, - Override: false, + Detectors: []string{"openshift"}, + DetectorConfig: openshiftConfig, + ClientConfig: cfg, + Override: false, }, }, { id: component.NewIDWithName(metadata.Type, "gcp"), expected: &Config{ - Detectors: []string{"env", "gcp"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "gcp"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "ec2"), expected: &Config{ - Detectors: []string{"env", "ec2"}, - DetectorConfig: ec2Config, - HTTPClientConfig: cfg, - Override: false, + Detectors: []string{"env", "ec2"}, + DetectorConfig: ec2Config, + ClientConfig: cfg, + Override: false, }, }, { id: component.NewIDWithName(metadata.Type, "system"), expected: &Config{ - Detectors: []string{"env", "system"}, - DetectorConfig: systemConfig, - HTTPClientConfig: cfg, - Override: false, - Attributes: []string{"a", "b"}, + Detectors: []string{"env", "system"}, + DetectorConfig: systemConfig, + ClientConfig: cfg, + Override: false, + Attributes: []string{"a", "b"}, }, }, { id: component.NewIDWithName(metadata.Type, "heroku"), expected: &Config{ - Detectors: []string{"env", "heroku"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "heroku"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "lambda"), expected: &Config{ - Detectors: []string{"env", "lambda"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "lambda"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "resourceattributes"), expected: &Config{ - Detectors: []string{"system", "ec2"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: resourceAttributesConfig, + Detectors: []string{"system", "ec2"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: resourceAttributesConfig, }, }, { diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index b3c291abf522e..ae6ba8aec4cd8 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -85,18 +85,18 @@ func (*factory) Type() component.Type { func createDefaultConfig() component.Config { return &Config{ - Detectors: []string{env.TypeStr}, - HTTPClientConfig: defaultHTTPClientConfig(), - Override: true, - Attributes: nil, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{env.TypeStr}, + ClientConfig: defaultClientConfig(), + Override: true, + Attributes: nil, + DetectorConfig: detectorCreateDefaultConfig(), // TODO: Once issue(https://github.com/open-telemetry/opentelemetry-collector/issues/4001) gets resolved, // Set the default value of 'hostname_source' here instead of 'system' detector } } -func defaultHTTPClientConfig() confighttp.HTTPClientConfig { - httpClientSettings := confighttp.NewDefaultHTTPClientConfig() +func defaultClientConfig() confighttp.ClientConfig { + httpClientSettings := confighttp.NewDefaultClientConfig() httpClientSettings.Timeout = 5 * time.Second return httpClientSettings } @@ -172,7 +172,7 @@ func (f *factory) getResourceDetectionProcessor( if oCfg.Attributes != nil { params.Logger.Warn("You are using deprecated `attributes` option that will be removed soon; use `resource_attributes` instead, details on configuration: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#migration-from-attributes-to-resource_attributes") } - provider, err := f.getResourceProvider(params, oCfg.HTTPClientConfig.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) + provider, err := f.getResourceProvider(params, oCfg.ClientConfig.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (f *factory) getResourceDetectionProcessor( return &resourceDetectionProcessor{ provider: provider, override: oCfg.Override, - httpClientSettings: oCfg.HTTPClientConfig, + httpClientSettings: oCfg.ClientConfig, telemetrySettings: params.TelemetrySettings, }, nil } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 45b994fc1d60e..7990a7a773e90 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -15,16 +15,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -108,13 +108,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index e6aa249dd57e5..8d63f4e971f56 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -445,40 +445,40 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go index 22fa2f943f4ca..34ae8022b4fb9 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go +++ b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go @@ -85,7 +85,7 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem res := d.rb.Emit() if len(d.tagKeyRegexes) != 0 { - client := getHTTPClientConfig(ctx, d.logger) + client := getClientConfig(ctx, d.logger) tags, err := connectAndFetchEc2Tags(meta.Region, meta.InstanceID, d.tagKeyRegexes, client) if err != nil { return res, "", fmt.Errorf("failed fetching ec2 instance tags: %w", err) @@ -98,7 +98,7 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem return res, conventions.SchemaURL, nil } -func getHTTPClientConfig(ctx context.Context, logger *zap.Logger) *http.Client { +func getClientConfig(ctx context.Context, logger *zap.Logger) *http.Client { client, err := internal.ClientFromContext(ctx) if err != nil { client = http.DefaultClient diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor.go b/processor/resourcedetectionprocessor/resourcedetection_processor.go index 81b12bad8ee8e..a3b07c6636ac4 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor.go @@ -21,7 +21,7 @@ type resourceDetectionProcessor struct { resource pcommon.Resource schemaURL string override bool - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig telemetrySettings component.TelemetrySettings } diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index 533e587fe8336..41201ca155274 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -162,9 +162,9 @@ func TestResourceProcessor(t *testing.T) { } cfg := &Config{ - Override: tt.override, - Detectors: tt.detectorKeys, - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: time.Second}, + Override: tt.override, + Detectors: tt.detectorKeys, + ClientConfig: confighttp.ClientConfig{Timeout: time.Second}, } // Test trace consumer diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 47643866f5c6f..44c41b3b10029 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 2ec16b5022c1f..775e99fd272ee 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -60,22 +60,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 91a4720e99666..f78e98f30bceb 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -139,7 +139,7 @@ func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) { otlpExporterFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index cb74706797355..192a104c491e3 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -56,18 +56,18 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 9d58c1ce4cc17..50b043baddefa 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -86,48 +86,48 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 12a9814999743..e6a235e9458b2 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -36,7 +36,7 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/schemaprocessor/config.go b/processor/schemaprocessor/config.go index c6f1dec5fc906..a9cd2108db8cf 100644 --- a/processor/schemaprocessor/config.go +++ b/processor/schemaprocessor/config.go @@ -19,7 +19,7 @@ var ( // Config defines the user provided values for the Schema Processor type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // PreCache is a list of schema URLs that are downloaded // and cached at the start of the collector runtime diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index 3b03beed97d3d..5afbafbae2535 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), Prefetch: []string{ "https://opentelemetry.io/schemas/1.9.0", }, diff --git a/processor/schemaprocessor/factory.go b/processor/schemaprocessor/factory.go index 77f4089b59d8b..a12ad5af94eeb 100644 --- a/processor/schemaprocessor/factory.go +++ b/processor/schemaprocessor/factory.go @@ -26,7 +26,7 @@ type factory struct{} // with the default values being used throughout it func newDefaultConfiguration() component.Config { return &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), } } diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 9e93f04b769d0..c9958e92f07a9 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/schema v0.0.7 go.opentelemetry.io/otel/trace v1.22.0 @@ -47,16 +47,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 389203cfe792f..0d317049a6311 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 9414072be608e..1b8943eb7e029 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,18 +54,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index d40dc1ce5e3e9..3e5345bd4f5ba 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -84,50 +84,50 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 1955dd41ce43b..ced0fae28edab 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -723,7 +723,7 @@ func newOTLPExporters(t *testing.T) (component.ID, exporter.Metrics, exporter.Tr otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 1e4de2c7a32b6..c7fcccaeb7f4c 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,9 +48,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 55e59222ee988..72504cfcc761f 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -73,24 +73,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/sumologicprocessor/go.mod b/processor/sumologicprocessor/go.mod index ae9857782f699..5bf0f621fb813 100644 --- a/processor/sumologicprocessor/go.mod +++ b/processor/sumologicprocessor/go.mod @@ -5,13 +5,13 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -57,14 +57,14 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/sumologicprocessor/go.sum b/processor/sumologicprocessor/go.sum index 3a150c6f53b1a..58ad3b5d438e9 100644 --- a/processor/sumologicprocessor/go.sum +++ b/processor/sumologicprocessor/go.sum @@ -135,39 +135,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index c06a44201a15d..0798c7d7a8edf 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 06d77e2a70be8..aa83dd665232e 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -109,20 +109,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 6f933a877d759..58be9ed7ee7e2 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 8a87e179dad73..8633ce2d4f53a 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -71,22 +71,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index f7e3559bc20b5..949f02b95f33f 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 34a9a518f50cf..cfc42422d1fdf 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -59,20 +59,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 94bb0e1a5fb67..0225bdf78d5a9 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,8 +82,8 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 5947820f98798..8f4b3aa2e3727 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -147,24 +147,24 @@ github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRF github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/apachereceiver/config.go b/receiver/apachereceiver/config.go index 7df3578bbce7c..b78ca79afdce0 100644 --- a/receiver/apachereceiver/config.go +++ b/receiver/apachereceiver/config.go @@ -15,7 +15,7 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index 397cf79c24dcb..f11e1dde67195 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 81d2b190ad781..d8368cab9d147 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,15 +82,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 41de5a28ca607..ae93146cc7361 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -146,38 +146,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 3e4d55fd2e0a7..ab17716b64f50 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -56,7 +56,7 @@ func TestScraper(t *testing.T) { func TestScraperFailedStart(t *testing.T) { sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/apachesparkreceiver/client_test.go b/receiver/apachesparkreceiver/client_test.go index 1796fab7e5345..655c17ecd3b59 100644 --- a/receiver/apachesparkreceiver/client_test.go +++ b/receiver/apachesparkreceiver/client_test.go @@ -37,7 +37,7 @@ func TestNewApacheSparkClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/apachesparkreceiver/config.go b/receiver/apachesparkreceiver/config.go index 02d485e1d441a..d9a44689237ca 100644 --- a/receiver/apachesparkreceiver/config.go +++ b/receiver/apachesparkreceiver/config.go @@ -27,7 +27,7 @@ var ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` ApplicationNames []string `mapstructure:"application_names"` } diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go index 1130e4319a506..2e43e5a5c551e 100644 --- a/receiver/apachesparkreceiver/config_test.go +++ b/receiver/apachesparkreceiver/config_test.go @@ -29,7 +29,7 @@ func TestValidate(t *testing.T) { { desc: "invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/apachesparkreceiver/factory.go b/receiver/apachesparkreceiver/factory.go index ac46b082b8b01..b2ec51d11045f 100644 --- a/receiver/apachesparkreceiver/factory.go +++ b/receiver/apachesparkreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/apachesparkreceiver/factory_test.go b/receiver/apachesparkreceiver/factory_test.go index 4d2219e7d3789..82e89ec4b6395 100644 --- a/receiver/apachesparkreceiver/factory_test.go +++ b/receiver/apachesparkreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: defaultCollectionInterval, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index ccba6bec3394b..8401db38660c8 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,16 +82,16 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index 1a1990444a36a..8c328ca9b5bb6 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/apachesparkreceiver/scraper_test.go b/receiver/apachesparkreceiver/scraper_test.go index 7ec0f72f61dc7..4a93d110d9457 100644 --- a/receiver/apachesparkreceiver/scraper_test.go +++ b/receiver/apachesparkreceiver/scraper_test.go @@ -69,7 +69,7 @@ func TestScraper(t *testing.T) { CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"local-123", "local-987"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), @@ -216,7 +216,7 @@ func TestScraper(t *testing.T) { CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"streaming-example"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/awscloudwatchmetricsreceiver/go.mod b/receiver/awscloudwatchmetricsreceiver/go.mod index ffdd106599169..96514a55a234d 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.mod +++ b/receiver/awscloudwatchmetricsreceiver/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awscloudwatchmetricsreceiver/go.sum b/receiver/awscloudwatchmetricsreceiver/go.sum index e6ec1e61c9b6b..14d49b044ff0c 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.sum +++ b/receiver/awscloudwatchmetricsreceiver/go.sum @@ -59,18 +59,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 6cc5e59882636..aa2f4bfe0283e 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index c98dfe847846b..e0fc3cc920e38 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -70,18 +70,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 554372365ea2b..a2197ae816032 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,12 +13,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -115,16 +115,16 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 38215c819dc3c..9a762ec6a4c47 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -374,38 +374,38 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go index 4dcf876e27b96..56d63bc1990b1 100644 --- a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go +++ b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go @@ -80,7 +80,7 @@ type ecsInfoOption func(*EcsInfo) // New creates a k8sApiServer which can generate cluster-level metrics func NewECSInfo(refreshInterval time.Duration, hostIPProvider hostIPProvider, host component.Host, settings component.TelemetrySettings, options ...ecsInfoOption) (*EcsInfo, error) { - setting := confighttp.HTTPClientConfig{ + setting := confighttp.ClientConfig{ Timeout: defaultTimeout, } diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 1937790b8584a..00e1e3eb26ba6 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -50,7 +50,7 @@ func createMetricsReceiver( if err != nil || endpoint == nil { return nil, fmt.Errorf("unable to detect task metadata endpoint: %w", err) } - clientSettings := confighttp.HTTPClientConfig{} + clientSettings := confighttp.ClientConfig{} rest, err := ecsutil.NewRestClient(*endpoint, clientSettings, params.TelemetrySettings) if err != nil { return nil, err diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 42e6685b8b470..8d8193334887c 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 0eb1d13f6037a..104896eda3021 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -73,40 +73,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awsfirehosereceiver/config.go b/receiver/awsfirehosereceiver/config.go index e5b70caa316f8..e6de4c2e50bac 100644 --- a/receiver/awsfirehosereceiver/config.go +++ b/receiver/awsfirehosereceiver/config.go @@ -11,10 +11,10 @@ import ( ) type Config struct { - // HTTPServerConfig is used to set up the Firehose delivery + // ServerConfig is used to set up the Firehose delivery // endpoint. The Firehose delivery stream expects an HTTPS // endpoint, so TLSSettings must be used to enable that. - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // RecordType is the key used to determine which unmarshaler to use // when receiving the requests. RecordType string `mapstructure:"record_type"` diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 1d4fcc1891e6f..2963f517bc164 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { require.Equal(t, &Config{ RecordType: "cwmetrics", AccessKey: "some_access_key", - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:4433", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index 531b81e907dcf..a9dcf82bf7368 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -64,7 +64,7 @@ func defaultMetricsUnmarshalers(logger *zap.Logger) map[string]unmarshaler.Metri func createDefaultConfig() component.Config { return &Config{ RecordType: defaultRecordType, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 4fc9ec8c09b1e..69ec75eb66ec3 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -5,15 +5,15 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,14 +48,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 540eaf2b0dec0..f39e9190c0df2 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -70,40 +70,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go index eac59d5e3b5af..6a4501aa096fe 100644 --- a/receiver/awsfirehosereceiver/receiver.go +++ b/receiver/awsfirehosereceiver/receiver.go @@ -111,13 +111,13 @@ func (fmr *firehoseReceiver) Start(_ context.Context, host component.Host) error } var err error - fmr.server, err = fmr.config.HTTPServerConfig.ToServer(host, fmr.settings.TelemetrySettings, fmr) + fmr.server, err = fmr.config.ServerConfig.ToServer(host, fmr.settings.TelemetrySettings, fmr) if err != nil { return err } var listener net.Listener - listener, err = fmr.config.HTTPServerConfig.ToListener() + listener, err = fmr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/awsfirehosereceiver/receiver_test.go b/receiver/awsfirehosereceiver/receiver_test.go index 1364296b35eed..63ebeb5b155c4 100644 --- a/receiver/awsfirehosereceiver/receiver_test.go +++ b/receiver/awsfirehosereceiver/receiver_test.go @@ -77,7 +77,7 @@ func TestStart(t *testing.T) { }) cfg := &Config{ RecordType: defaultRecordType, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: listener.Addr().String(), }, } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index f65d56109694a..390318bbd04d5 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,10 +53,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index b16b75b0ce7b6..c221d2937238d 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -72,30 +72,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 432ba415c1c9d..00c2dd3222855 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -76,15 +76,15 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 27806c1c4c2db..003bd8c721804 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -194,39 +194,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index ad77fa6bcf572..2f90ca2d7a762 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.93.0 github.com/relvacode/iso8601 v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -80,13 +80,13 @@ require ( github.com/valyala/fastjson v1.6.4 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index e0a30c7ca4ed9..7287092c010ef 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -189,39 +189,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index aa53f0d3c506d..357861c7eecab 100644 --- a/receiver/azuremonitorreceiver/go.mod +++ b/receiver/azuremonitorreceiver/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,8 +52,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/azuremonitorreceiver/go.sum b/receiver/azuremonitorreceiver/go.sum index fac76847d2359..d563cb8bd12c4 100644 --- a/receiver/azuremonitorreceiver/go.sum +++ b/receiver/azuremonitorreceiver/go.sum @@ -82,20 +82,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/bigipreceiver/client_test.go b/receiver/bigipreceiver/client_test.go index 9661f790a13bd..0353f292f4182 100644 --- a/receiver/bigipreceiver/client_test.go +++ b/receiver/bigipreceiver/client_test.go @@ -48,7 +48,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -65,7 +65,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/bigipreceiver/config.go b/receiver/bigipreceiver/config.go index 6f21a9fa474a9..5e66b666b5e7d 100644 --- a/receiver/bigipreceiver/config.go +++ b/receiver/bigipreceiver/config.go @@ -28,7 +28,7 @@ const defaultEndpoint = "https://localhost:443" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index 797b801bebfc1..83f35267e8314 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -46,7 +46,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), }, @@ -59,7 +59,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -74,7 +74,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -88,7 +88,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index c28c140336eb7..9f9f40b1da696 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index c216cba3d424b..6286f39232e35 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestNewFactory(t *testing.T) { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index c61c1e3a6b6dd..1fd83dfb7cbce 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,14 +85,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 1a1990444a36a..8c328ca9b5bb6 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index f78d8b04f6d73..f7a2c0bea0e83 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -36,7 +36,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &bigipScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -53,7 +53,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &bigipScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e1e88f5dde05b..a449ffe53e98e 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index c78f7f0e1875f..73a07b4b0796a 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -60,24 +60,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 18543871032c4..310e0d4797cc1 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index 558c0ce297b81..611d219006cf3 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -71,20 +71,20 @@ github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod index bf1add98d874f..eabf9a170cb79 100644 --- a/receiver/cloudflarereceiver/go.mod +++ b/receiver/cloudflarereceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,9 +45,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum index db01af07de9f0..032925fb34d89 100644 --- a/receiver/cloudflarereceiver/go.sum +++ b/receiver/cloudflarereceiver/go.sum @@ -63,24 +63,24 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/cloudfoundryreceiver/config.go b/receiver/cloudfoundryreceiver/config.go index 25e5a8a091328..f871288aac184 100644 --- a/receiver/cloudfoundryreceiver/config.go +++ b/receiver/cloudfoundryreceiver/config.go @@ -13,26 +13,26 @@ import ( ) type RLPGatewayConfig struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - ShardID string `mapstructure:"shard_id"` + confighttp.ClientConfig `mapstructure:",squash"` + ShardID string `mapstructure:"shard_id"` } -// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedHTTPClientConfig for more details +// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedClientConfig for more details type LimitedTLSClientSetting struct { InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` } -// LimitedHTTPClientConfig is a subset of HTTPClientConfig, implemented as a separate type due to the library this +// LimitedClientConfig is a subset of ClientConfig, implemented as a separate type due to the library this // configuration is used with not taking a preconfigured http.Client as input, but only taking these specific options -type LimitedHTTPClientConfig struct { +type LimitedClientConfig struct { Endpoint string `mapstructure:"endpoint"` TLSSetting LimitedTLSClientSetting `mapstructure:"tls"` } type UAAConfig struct { - LimitedHTTPClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + LimitedClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Config defines configuration for Collectd receiver. diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index 9d124aae81112..b8083f1da0232 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "one"), expected: &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", TLSSetting: configtls.TLSClientSetting{ InsecureSkipVerify: true, @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { ShardID: "otel-test", }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: "https://uaa.sys.example.internal", TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: true, @@ -102,17 +102,17 @@ func TestInvalidConfigValidation(t *testing.T) { } func TestHTTPConfigurationStructConsistency(t *testing.T) { - // LimitedHTTPClientConfig must have the same structure as HTTPClientConfig, but without the fields that the UAA + // LimitedClientConfig must have the same structure as ClientConfig, but without the fields that the UAA // library does not support. - checkTypeFieldMatch(t, "Endpoint", reflect.TypeOf(LimitedHTTPClientConfig{}), reflect.TypeOf(confighttp.HTTPClientConfig{})) - checkTypeFieldMatch(t, "TLSSetting", reflect.TypeOf(LimitedHTTPClientConfig{}), reflect.TypeOf(confighttp.HTTPClientConfig{})) + checkTypeFieldMatch(t, "Endpoint", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) + checkTypeFieldMatch(t, "TLSSetting", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) checkTypeFieldMatch(t, "InsecureSkipVerify", reflect.TypeOf(LimitedTLSClientSetting{}), reflect.TypeOf(configtls.TLSClientSetting{})) } func loadSuccessfulConfig(t *testing.T) *Config { configuration := &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", Timeout: time.Second * 20, TLSSetting: configtls.TLSClientSetting{ @@ -122,7 +122,7 @@ func loadSuccessfulConfig(t *testing.T) *Config { ShardID: "otel-test", }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: "https://uaa.sys.example.internal", TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: true, diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index e738804168edf..38ae50a0c76fd 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultURL, TLSSetting: configtls.TLSClientSetting{ InsecureSkipVerify: false, @@ -43,7 +43,7 @@ func createDefaultConfig() component.Config { ShardID: defaultRLPGatewayShardID, }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: defaultURL, TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: false, diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 403b7b85a7348..ddc79e9295871 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,14 +6,14 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index c9d213434942c..ee2cb0b809dca 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -108,38 +108,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 2f6d4adbf3cfa..702fd87e1058a 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -66,7 +66,7 @@ func newCloudFoundryReceiver( } func (cfr *cloudFoundryReceiver) Start(ctx context.Context, host component.Host) error { - tokenProvider, tokenErr := newUAATokenProvider(cfr.settings.Logger, cfr.config.UAA.LimitedHTTPClientConfig, cfr.config.UAA.Username, string(cfr.config.UAA.Password)) + tokenProvider, tokenErr := newUAATokenProvider(cfr.settings.Logger, cfr.config.UAA.LimitedClientConfig, cfr.config.UAA.Username, string(cfr.config.UAA.Password)) if tokenErr != nil { return fmt.Errorf("create cloud foundry UAA token provider: %w", tokenErr) } @@ -74,7 +74,7 @@ func (cfr *cloudFoundryReceiver) Start(ctx context.Context, host component.Host) streamFactory, streamErr := newEnvelopeStreamFactory( cfr.settings, tokenProvider, - cfr.config.RLPGateway.HTTPClientConfig, + cfr.config.RLPGateway.ClientConfig, host, ) if streamErr != nil { diff --git a/receiver/cloudfoundryreceiver/stream.go b/receiver/cloudfoundryreceiver/stream.go index fdada0be9006a..a5e070272cddb 100644 --- a/receiver/cloudfoundryreceiver/stream.go +++ b/receiver/cloudfoundryreceiver/stream.go @@ -24,7 +24,7 @@ type EnvelopeStreamFactory struct { func newEnvelopeStreamFactory( settings component.TelemetrySettings, authTokenProvider *UAATokenProvider, - httpConfig confighttp.HTTPClientConfig, + httpConfig confighttp.ClientConfig, host component.Host) (*EnvelopeStreamFactory, error) { httpClient, err := httpConfig.ToClient(host, settings) diff --git a/receiver/cloudfoundryreceiver/stream_test.go b/receiver/cloudfoundryreceiver/stream_test.go index 04114afa6600a..c146121f26bd7 100644 --- a/receiver/cloudfoundryreceiver/stream_test.go +++ b/receiver/cloudfoundryreceiver/stream_test.go @@ -19,7 +19,7 @@ func TestValidStream(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -29,7 +29,7 @@ func TestValidStream(t *testing.T) { streamFactory, streamErr := newEnvelopeStreamFactory( componenttest.NewNopTelemetrySettings(), uaa, - cfg.RLPGateway.HTTPClientConfig, + cfg.RLPGateway.ClientConfig, componenttest.NewNopHost()) require.NoError(t, streamErr) @@ -55,7 +55,7 @@ func TestInvalidStream(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -66,7 +66,7 @@ func TestInvalidStream(t *testing.T) { streamFactory, streamErr := newEnvelopeStreamFactory( componenttest.NewNopTelemetrySettings(), uaa, - cfg.RLPGateway.HTTPClientConfig, + cfg.RLPGateway.ClientConfig, componenttest.NewNopHost()) require.NoError(t, streamErr) diff --git a/receiver/cloudfoundryreceiver/uaa.go b/receiver/cloudfoundryreceiver/uaa.go index 811178b961360..ae7637560449a 100644 --- a/receiver/cloudfoundryreceiver/uaa.go +++ b/receiver/cloudfoundryreceiver/uaa.go @@ -28,7 +28,7 @@ type UAATokenProvider struct { mutex *sync.Mutex } -func newUAATokenProvider(logger *zap.Logger, config LimitedHTTPClientConfig, username string, password string) (*UAATokenProvider, error) { +func newUAATokenProvider(logger *zap.Logger, config LimitedClientConfig, username string, password string) (*UAATokenProvider, error) { client, err := uaago.NewClient(config.Endpoint) if err != nil { return nil, err diff --git a/receiver/cloudfoundryreceiver/uaa_test.go b/receiver/cloudfoundryreceiver/uaa_test.go index 1a52338a04e3a..738def7213da3 100644 --- a/receiver/cloudfoundryreceiver/uaa_test.go +++ b/receiver/cloudfoundryreceiver/uaa_test.go @@ -17,7 +17,7 @@ func TestValidAuthentication(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -27,7 +27,7 @@ func TestValidAuthentication(t *testing.T) { // No username or password should still succeed uaa, err = newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, "", "") @@ -40,11 +40,11 @@ func TestInvalidAuthentication(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.UAA.LimitedHTTPClientConfig.Endpoint = "" + cfg.UAA.LimitedClientConfig.Endpoint = "" uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) diff --git a/receiver/collectdreceiver/config.go b/receiver/collectdreceiver/config.go index f0c582df52ac9..1d41d3e3bbd12 100644 --- a/receiver/collectdreceiver/config.go +++ b/receiver/collectdreceiver/config.go @@ -13,10 +13,10 @@ import ( // Config defines configuration for Collectd receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - Timeout time.Duration `mapstructure:"timeout"` - Encoding string `mapstructure:"encoding"` - AttributesPrefix string `mapstructure:"attributes_prefix"` + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + Timeout time.Duration `mapstructure:"timeout"` + Encoding string `mapstructure:"encoding"` + AttributesPrefix string `mapstructure:"attributes_prefix"` } func (c *Config) Validate() error { diff --git a/receiver/collectdreceiver/config_test.go b/receiver/collectdreceiver/config_test.go index 23a342496a885..5adedc525f1e6 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "one"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12345", }, Timeout: 50 * time.Second, diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index f461b3de4e037..62f55d0eaa73c 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -31,7 +31,7 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: defaultBindEndpoint, }, Timeout: 30 * time.Second, diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index c7ea293df9071..4607b5a6fefce 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -49,16 +49,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 68dc45be2c737..6116adc8d8e29 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index 1a80216fb781b..50dee268977d6 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -58,7 +58,7 @@ func newCollectdReceiver( // Start starts an HTTP server that can process CollectD JSON requests. func (cdr *collectdReceiver) Start(_ context.Context, host component.Host) error { var err error - cdr.server, err = cdr.config.HTTPServerConfig.ToServer(host, cdr.createSettings.TelemetrySettings, cdr) + cdr.server, err = cdr.config.ServerConfig.ToServer(host, cdr.createSettings.TelemetrySettings, cdr) if err != nil { return err } @@ -72,7 +72,7 @@ func (cdr *collectdReceiver) Start(_ context.Context, host component.Host) error if err != nil { return err } - l, err := cdr.config.HTTPServerConfig.ToListener() + l, err := cdr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/collectdreceiver/receiver_test.go b/receiver/collectdreceiver/receiver_test.go index 65bbd3ab46e7d..29140c07a88d2 100644 --- a/receiver/collectdreceiver/receiver_test.go +++ b/receiver/collectdreceiver/receiver_test.go @@ -47,7 +47,7 @@ func TestNewReceiver(t *testing.T) { name: "nil next Consumer", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: ":0", }, }, @@ -59,7 +59,7 @@ func TestNewReceiver(t *testing.T) { name: "happy path", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: ":0", }, }, @@ -89,7 +89,7 @@ func TestCollectDServer(t *testing.T) { } config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8081", }, } @@ -178,7 +178,7 @@ func TestCollectDServer(t *testing.T) { sink.Reset() req, err := http.NewRequest( tt.HTTPMethod, - "http://"+config.HTTPServerConfig.Endpoint+"?"+tt.QueryParams, + "http://"+config.ServerConfig.Endpoint+"?"+tt.QueryParams, bytes.NewBuffer([]byte(tt.RequestBody)), ) require.NoError(t, err) diff --git a/receiver/couchdbreceiver/client_test.go b/receiver/couchdbreceiver/client_test.go index 7e8bce953427e..803eec0603ef8 100644 --- a/receiver/couchdbreceiver/client_test.go +++ b/receiver/couchdbreceiver/client_test.go @@ -33,7 +33,7 @@ func TestNewCouchDBClient(t *testing.T) { t.Run("Invalid config", func(t *testing.T) { couchdbClient, err := newCouchDBClient( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -109,7 +109,7 @@ func TestGet(t *testing.T) { url := ts.URL + "/_node/_local/_stats/couchdb" couchdbClient, err := newCouchDBClient( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: url, }, Username: "unauthorized", @@ -182,7 +182,7 @@ func TestBuildReq(t *testing.T) { couchdbClient := couchDBClient{ client: &http.Client{}, cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, Username: "otelu", @@ -204,7 +204,7 @@ func TestBuildBadReq(t *testing.T) { couchdbClient := couchDBClient{ client: &http.Client{}, cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/couchdbreceiver/config.go b/receiver/couchdbreceiver/config.go index 24f97b507cc80..5a47ca552ec22 100644 --- a/receiver/couchdbreceiver/config.go +++ b/receiver/couchdbreceiver/config.go @@ -30,7 +30,7 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index f98fb6e683873..b7a19667d8c9f 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -42,7 +42,7 @@ func TestValidate(t *testing.T) { { desc: "missing password and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -56,7 +56,7 @@ func TestValidate(t *testing.T) { { desc: "missing username and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -72,7 +72,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otel", Password: "otel", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -84,7 +84,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otel", Password: "otel", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index e3d439495b60a..de7cf6c8e2a82 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -29,7 +29,7 @@ func createDefaultConfig() component.Config { return &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, Timeout: 1 * time.Minute, diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 4176a8325aacd..3f6adfdcdc3e0 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index ee4eee27afb0d..90d307dfab2d7 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index 06ffa5869b199..5f9f8a589c048 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -132,7 +132,7 @@ func TestStart(t *testing.T) { t.Run("start fail", func(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.TLSSetting.CAFile = "/non/existent" + cfg.ClientConfig.TLSSetting.CAFile = "/non/existent" cfg.Username = "otelu" cfg.Password = "otelp" require.NoError(t, component.ValidateConfig(cfg)) @@ -158,7 +158,7 @@ func TestMetricSettings(t *testing.T) { CouchdbHttpdViews: metadata.MetricConfig{Enabled: false}, } cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, MetricsBuilderConfig: mbc, } scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) diff --git a/receiver/datadogreceiver/config.go b/receiver/datadogreceiver/config.go index 5e97a84310f5d..646309c997630 100644 --- a/receiver/datadogreceiver/config.go +++ b/receiver/datadogreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // ReadTimeout of the http server ReadTimeout time.Duration `mapstructure:"read_timeout"` } diff --git a/receiver/datadogreceiver/factory.go b/receiver/datadogreceiver/factory.go index d4253df480abe..66a467a67e1db 100644 --- a/receiver/datadogreceiver/factory.go +++ b/receiver/datadogreceiver/factory.go @@ -27,7 +27,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8126", }, ReadTimeout: 60 * time.Second, diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index 1cc583cf34c38..e35cc86c98b53 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmihailenco/msgpack/v4 v4.3.13 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,17 +51,17 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/tinylib/msgp v1.1.9 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index fae2c3318b79f..2bb85285f92ab 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -89,40 +89,40 @@ github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go index 2f5dffc05cfb2..b6ca43edfeeb9 100644 --- a/receiver/datadogreceiver/receiver.go +++ b/receiver/datadogreceiver/receiver.go @@ -55,7 +55,7 @@ func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error ddmux.HandleFunc("/api/v0.2/traces", ddr.handleTraces) var err error - ddr.server, err = ddr.config.HTTPServerConfig.ToServer( + ddr.server, err = ddr.config.ServerConfig.ToServer( host, ddr.params.TelemetrySettings, ddmux, @@ -63,7 +63,7 @@ func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error if err != nil { return fmt.Errorf("failed to create server definition: %w", err) } - hln, err := ddr.config.HTTPServerConfig.ToListener() + hln, err := ddr.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to create datadog listener: %w", err) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index f14d4ccaf27fe..8e8f20278dc2c 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -80,8 +80,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index dd40c7f3e93b6..4104200b53671 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -140,24 +140,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/elasticsearchreceiver/client.go b/receiver/elasticsearchreceiver/client.go index b008ab2a109d4..864fcb39f5b46 100644 --- a/receiver/elasticsearchreceiver/client.go +++ b/receiver/elasticsearchreceiver/client.go @@ -49,7 +49,7 @@ type defaultElasticsearchClient struct { var _ elasticsearchClient = (*defaultElasticsearchClient)(nil) func newElasticsearchClient(settings component.TelemetrySettings, c Config, h component.Host) (*defaultElasticsearchClient, error) { - client, err := c.HTTPClientConfig.ToClient(h, settings) + client, err := c.ClientConfig.ToClient(h, settings) if err != nil { return nil, err } diff --git a/receiver/elasticsearchreceiver/client_test.go b/receiver/elasticsearchreceiver/client_test.go index ff05bc1e6a5f6..452a7c0172cdb 100644 --- a/receiver/elasticsearchreceiver/client_test.go +++ b/receiver/elasticsearchreceiver/client_test.go @@ -23,7 +23,7 @@ import ( func TestCreateClientInvalidEndpoint(t *testing.T) { _, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://\x00", }, }, componenttest.NewNopHost()) @@ -40,7 +40,7 @@ func TestNodeStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -62,7 +62,7 @@ func TestNodeStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -85,7 +85,7 @@ func TestNodeStatsNilIOStats(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -111,7 +111,7 @@ func TestNodeStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -131,7 +131,7 @@ func TestNodeStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -147,7 +147,7 @@ func TestNodeStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -170,7 +170,7 @@ func TestClusterHealthNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -196,7 +196,7 @@ func TestClusterHealthAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -216,7 +216,7 @@ func TestClusterHealthNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -232,7 +232,7 @@ func TestClusterHealthNoAuthorization(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -255,7 +255,7 @@ func TestMetadataNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -281,7 +281,7 @@ func TestMetadataAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -301,7 +301,7 @@ func TestMetadataNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -317,7 +317,7 @@ func TestMetadataNoAuthorization(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -332,7 +332,7 @@ func TestMetadataNoAuthorization(t *testing.T) { func TestDoRequestBadPath(t *testing.T) { client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.localhost:9200", }, }, componenttest.NewNopHost()) @@ -344,7 +344,7 @@ func TestDoRequestBadPath(t *testing.T) { func TestDoRequestClientTimeout(t *testing.T) { client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.localhost:9200", }, }, componenttest.NewNopHost()) @@ -362,7 +362,7 @@ func TestDoRequest404(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -383,7 +383,7 @@ func TestIndexStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -405,7 +405,7 @@ func TestIndexStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -431,7 +431,7 @@ func TestIndexStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -451,7 +451,7 @@ func TestIndexStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -467,7 +467,7 @@ func TestIndexStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -490,7 +490,7 @@ func TestClusterStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -512,7 +512,7 @@ func TestClusterStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -538,7 +538,7 @@ func TestClusterStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -558,7 +558,7 @@ func TestClusterStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -574,7 +574,7 @@ func TestClusterStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", diff --git a/receiver/elasticsearchreceiver/config.go b/receiver/elasticsearchreceiver/config.go index 0a3fcca3855ba..711cd4aed6d7b 100644 --- a/receiver/elasticsearchreceiver/config.go +++ b/receiver/elasticsearchreceiver/config.go @@ -30,7 +30,7 @@ var ( // Config is the configuration for the elasticsearch receiver type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` // Nodes defines the nodes to scrape. diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 51c00e18044a3..42c9bc1d215eb 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -167,7 +167,7 @@ func TestLoadConfig(t *testing.T) { MetricsBuilderConfig: defaultMetrics, Username: "otel", Password: "password", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10000000000, Endpoint: "http://example.com:9200", }, diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 814ce4832fbda..b64323dac3e91 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultHTTPClientTimeout, }, diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 02b4bd1b4cf44..b095fab0c0a88 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -10,15 +10,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -86,13 +86,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 1a1990444a36a..8c328ca9b5bb6 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 5ca01f2828e5e..74cad46a44402 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -209,7 +209,7 @@ func TestScraperFailedStart(t *testing.T) { conf := createDefaultConfig().(*Config) - conf.HTTPClientConfig = confighttp.HTTPClientConfig{ + conf.ClientConfig = confighttp.ClientConfig{ Endpoint: "localhost:9200", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index e4c9be9b64be8..81ad5ba1a0bdb 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -16,7 +16,7 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index d7c8ca7148fff..098e59b0606fd 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { InitialDelay: time.Second, Timeout: time.Second * 5, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:8000/custom/path", Timeout: time.Second * 5, }, diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index f32eebb9c142d..e617a88d58563 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -58,7 +58,7 @@ func newMetricsReceiver( func newDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultTimeout, }, diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index d185ecd5b2282..0c00df0b6afee 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateMetricsReceiver(t *testing.T) { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 3095564a1532e..138914c687d72 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 3dbcfbd618afb..e907ff4c82dd8 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/expvarreceiver/scraper.go b/receiver/expvarreceiver/scraper.go index 17d693ce8b4b1..7fea64fec9b85 100644 --- a/receiver/expvarreceiver/scraper.go +++ b/receiver/expvarreceiver/scraper.go @@ -41,7 +41,7 @@ func newExpVarScraper(cfg *Config, set receiver.CreateSettings) *expVarScraper { } func (e *expVarScraper) start(_ context.Context, host component.Host) error { - client, err := e.cfg.HTTPClientConfig.ToClient(host, e.set.TelemetrySettings) + client, err := e.cfg.ClientConfig.ToClient(host, e.set.TelemetrySettings) if err != nil { return err } diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 656ec963dc63d..1445cc7128305 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,10 +48,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 248ec0b5aeed5..f64eb2fd729f9 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -79,24 +79,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/filereceiver/go.mod b/receiver/filereceiver/go.mod index c9785dbad13cc..46f43be5897a9 100644 --- a/receiver/filereceiver/go.mod +++ b/receiver/filereceiver/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filereceiver/go.sum b/receiver/filereceiver/go.sum index b57cf8171f509..5b0ddbddc7471 100644 --- a/receiver/filereceiver/go.sum +++ b/receiver/filereceiver/go.sum @@ -59,18 +59,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/filestatsreceiver/go.mod b/receiver/filestatsreceiver/go.mod index 9ae709557c21b..09de6a0e8ec14 100644 --- a/receiver/filestatsreceiver/go.mod +++ b/receiver/filestatsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filestatsreceiver/go.sum b/receiver/filestatsreceiver/go.sum index 3c02468dc20a7..9009a87df6248 100644 --- a/receiver/filestatsreceiver/go.sum +++ b/receiver/filestatsreceiver/go.sum @@ -138,20 +138,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index 843c16c7fd6ea..73ad35b0a788e 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -58,7 +58,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -75,7 +75,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/flinkmetricsreceiver/config.go b/receiver/flinkmetricsreceiver/config.go index d1f5b6d70b416..d53245e1a70f1 100644 --- a/receiver/flinkmetricsreceiver/config.go +++ b/receiver/flinkmetricsreceiver/config.go @@ -18,7 +18,7 @@ const defaultEndpoint = "http://localhost:8081" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 86b65e5525dfd..706acf2f6e56a 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { desc: "invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -38,7 +38,7 @@ func TestValidate(t *testing.T) { { desc: "valid config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index a38dd96df1f2d..2afaf24041798 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -34,7 +34,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 239fe074dd181..69fa78b8becca 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 36af977ed3b29..5537736f8f307 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index ee4eee27afb0d..90d307dfab2d7 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index 41299e511f4ab..16ae320763394 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -42,7 +42,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &flinkmetricsScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -59,7 +59,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &flinkmetricsScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index bd8363aa54247..3350deea6275c 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tinylib/msgp v1.1.9 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 6e707c4ce54f6..96b23df23a650 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -100,20 +100,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index acfe63be6b4bb..cc85a874c96e1 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/go-github/v58 v58.0.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -67,20 +67,20 @@ require ( github.com/vektah/gqlparser/v2 v2.5.11 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 6a10e8d6e5a33..1d6fdf4e0ddd1 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -154,53 +154,53 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go index 4ace9e8cc042a..79642ed06b1cd 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go @@ -13,7 +13,7 @@ import ( // Config relating to Github Metric Scraper. type Config struct { metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` internal.ScraperConfig // GitHubOrg is the name of the GitHub organization to srape (github scraper only) GitHubOrg string `mapstructure:"github_org"` diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go index 6cf8b8540fea3..9f39b0bca9388 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go @@ -21,7 +21,7 @@ func TestConfig(t *testing.T) { expectedConfig := &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 15 * time.Second, }, } diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go index a2a30cad3ad1a..f47aa2d7d0808 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go @@ -28,7 +28,7 @@ type Factory struct{} func (f *Factory) CreateDefaultConfig() internal.Config { return &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, }, } diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go index 606f311d4b833..9a4e53b941301 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go @@ -109,7 +109,7 @@ func genDefaultSearchQuery(ownertype string, ghorg string) string { // Returns the graphql and rest clients for GitHub. // By default, the graphql client will use the public GitHub API URL as will // the rest client. If the user has specified an endpoint in the config via the -// inherited HTTPClientConfig, then the both clients will use that endpoint. +// inherited ClientConfig, then the both clients will use that endpoint. // The endpoint defined needs to be the root server. // See the GitHub documentation for more information. // https://docs.github.com/en/graphql/guides/forming-calls-with-graphql#the-graphql-endpoint @@ -119,11 +119,11 @@ func (ghs *githubScraper) createClients() (gClient graphql.Client, rClient *gith rClient = github.NewClient(ghs.client) gClient = graphql.NewClient(defaultGraphURL, ghs.client) - if ghs.cfg.HTTPClientConfig.Endpoint != "" { + if ghs.cfg.ClientConfig.Endpoint != "" { // Given endpoint set as `https://myGHEserver.com` we need to join the path // with `api/graphql` - gu, err := url.JoinPath(ghs.cfg.HTTPClientConfig.Endpoint, "api/graphql") + gu, err := url.JoinPath(ghs.cfg.ClientConfig.Endpoint, "api/graphql") if err != nil { ghs.logger.Sugar().Errorf("error joining graphql endpoint: %v", err) return nil, nil, err @@ -131,7 +131,7 @@ func (ghs *githubScraper) createClients() (gClient graphql.Client, rClient *gith gClient = graphql.NewClient(gu, ghs.client) // The rest client needs the endpoint to be the root of the server - ru := ghs.cfg.HTTPClientConfig.Endpoint + ru := ghs.cfg.ClientConfig.Endpoint rClient, err = github.NewClient(ghs.client).WithEnterpriseURLs(ru, ru) if err != nil { ghs.logger.Sugar().Errorf("error creating enterprise client: %v", err) diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 78d0e307d2be2..0060ff32802a0 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -60,10 +60,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 9071f90e34e18..5a39d3c77bca3 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -130,26 +130,26 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 8eeb60b1a4285..ae1a09a7d7d54 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -61,8 +61,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index df3742d4821b2..657e5095ce72e 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -140,20 +140,20 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/receiver/haproxyreceiver/config.go b/receiver/haproxyreceiver/config.go index 7e2336a6a8c1b..b141ed3ea2f00 100644 --- a/receiver/haproxyreceiver/config.go +++ b/receiver/haproxyreceiver/config.go @@ -13,13 +13,13 @@ import ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { - if c.HTTPClientConfig.Endpoint == "" { + if c.ClientConfig.Endpoint == "" { return errors.New("'endpoint' cannot be empty") } return nil diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index cbe96b883e224..42b9d96f971b7 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,16 +82,16 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index 41de5a28ca607..ae93146cc7361 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -146,38 +146,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/haproxyreceiver/scraper.go b/receiver/haproxyreceiver/scraper.go index 036e21660d98d..1da146589eb09 100644 --- a/receiver/haproxyreceiver/scraper.go +++ b/receiver/haproxyreceiver/scraper.go @@ -287,7 +287,7 @@ func (s *scraper) readStats(buf []byte) ([]map[string]string, error) { func (s *scraper) start(_ context.Context, host component.Host) error { var err error - s.httpClient, err = s.cfg.HTTPClientConfig.ToClient(host, s.telemetrySettings) + s.httpClient, err = s.cfg.ClientConfig.ToClient(host, s.telemetrySettings) return err } diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index f134be8e7a920..12d47a23d7893 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -12,13 +12,13 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 github.com/yusufpapurcu/wmi v1.2.3 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -90,14 +90,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 2cace6bca4c06..b17a0161b624c 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -325,39 +325,39 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/httpcheckreceiver/config.go b/receiver/httpcheckreceiver/config.go index 5982537b4f13b..1da306717bb42 100644 --- a/receiver/httpcheckreceiver/config.go +++ b/receiver/httpcheckreceiver/config.go @@ -29,8 +29,8 @@ type Config struct { } type targetConfig struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - Method string `mapstructure:"method"` + confighttp.ClientConfig `mapstructure:",squash"` + Method string `mapstructure:"method"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go index 3da332ac6d4e9..3758afa31ca45 100644 --- a/receiver/httpcheckreceiver/config_test.go +++ b/receiver/httpcheckreceiver/config_test.go @@ -26,7 +26,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, }, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -40,7 +40,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -56,12 +56,12 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:80", }, }, { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -77,7 +77,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "www.opentelemetry.io/docs", }, }, @@ -93,12 +93,12 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://opentelemetry.io", }, }, { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://opentelemetry.io:80/docs", }, }, diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 8cecaed7484f7..019da4caeee5f 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 3dbcfbd618afb..e907ff4c82dd8 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index 9521c15929020..25008541d6aaa 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -43,7 +43,7 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -64,7 +64,7 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: "http://example.com", }, @@ -159,7 +159,7 @@ func TestScaperScrape(t *testing.T) { cfg := createDefaultConfig().(*Config) if len(tc.endpoint) > 0 { cfg.Targets = []*targetConfig{{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: tc.endpoint, }}, } @@ -167,7 +167,7 @@ func TestScaperScrape(t *testing.T) { ms := newMockServer(t, tc.expectedResponse) defer ms.Close() cfg.Targets = []*targetConfig{{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms.URL, }}, } @@ -205,12 +205,12 @@ func TestScraperMultipleTargets(t *testing.T) { defer ms2.Close() cfg.Targets = append(cfg.Targets, &targetConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms1.URL, }, }) cfg.Targets = append(cfg.Targets, &targetConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms2.URL, }, }) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 062f420ea23fa..d8701aa58d8ab 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index 4923eeeab27af..428fea028b5bf 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -136,20 +136,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/influxdbreceiver/config.go b/receiver/influxdbreceiver/config.go index d68a0d7166870..a49f169b08d5d 100644 --- a/receiver/influxdbreceiver/config.go +++ b/receiver/influxdbreceiver/config.go @@ -9,5 +9,5 @@ import ( // Config defines configuration for the InfluxDB receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` } diff --git a/receiver/influxdbreceiver/factory.go b/receiver/influxdbreceiver/factory.go index d12555f918686..7ec6cc5bbe25e 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -27,7 +27,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 80cf201f5bc43..7ff315eabf43b 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -56,17 +56,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 53db70d2b9a43..61b2841ec6c8c 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -114,40 +114,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/influxdbreceiver/receiver.go b/receiver/influxdbreceiver/receiver.go index 7ed2a4bdafdc1..96e2416533614 100644 --- a/receiver/influxdbreceiver/receiver.go +++ b/receiver/influxdbreceiver/receiver.go @@ -26,7 +26,7 @@ import ( type metricsReceiver struct { nextConsumer consumer.Metrics - httpServerSettings *confighttp.HTTPServerConfig + httpServerSettings *confighttp.ServerConfig converter *influx2otel.LineProtocolToOtelMetrics server *http.Server @@ -56,7 +56,7 @@ func newMetricsReceiver(config *Config, settings receiver.CreateSettings, nextCo return &metricsReceiver{ nextConsumer: nextConsumer, - httpServerSettings: &config.HTTPServerConfig, + httpServerSettings: &config.ServerConfig, converter: converter, logger: influxLogger, obsrecv: obsrecv, diff --git a/receiver/influxdbreceiver/receiver_test.go b/receiver/influxdbreceiver/receiver_test.go index 29b9d44d6866c..34e6fcf67550c 100644 --- a/receiver/influxdbreceiver/receiver_test.go +++ b/receiver/influxdbreceiver/receiver_test.go @@ -24,7 +24,7 @@ import ( func TestWriteLineProtocol_v2API(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index d6e2e6a5ab8c1..4ed9dda665ca5 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -28,18 +28,18 @@ const ( // RemoteSamplingConfig defines config key for remote sampling fetch endpoint type RemoteSamplingConfig struct { - HostEndpoint string `mapstructure:"host_endpoint"` - StrategyFile string `mapstructure:"strategy_file"` - StrategyFileReloadInterval time.Duration `mapstructure:"strategy_file_reload_interval"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` + HostEndpoint string `mapstructure:"host_endpoint"` + StrategyFile string `mapstructure:"strategy_file"` + StrategyFileReloadInterval time.Duration `mapstructure:"strategy_file_reload_interval"` + configgrpc.ClientConfig `mapstructure:",squash"` } // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - ThriftHTTP *confighttp.HTTPServerConfig `mapstructure:"thrift_http"` - ThriftBinary *ProtocolUDP `mapstructure:"thrift_binary"` - ThriftCompact *ProtocolUDP `mapstructure:"thrift_compact"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + ThriftHTTP *confighttp.ServerConfig `mapstructure:"thrift_http"` + ThriftBinary *ProtocolUDP `mapstructure:"thrift_binary"` + ThriftCompact *ProtocolUDP `mapstructure:"thrift_compact"` } // ProtocolUDP is the configuration for a UDP protocol. diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index ec7c046980c8d..21265154932a6 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -33,13 +33,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: ":3456", }, ThriftCompact: &ProtocolUDP{ @@ -67,13 +67,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", }, ThriftCompact: &ProtocolUDP{ @@ -91,7 +91,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "mixed"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", @@ -108,7 +108,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", @@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) { }, }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: ":3456", }, }, @@ -174,7 +174,7 @@ func TestInvalidConfig(t *testing.T) { { desc: "thrift-http-no-port", apply: func(cfg *Config) { - cfg.ThriftHTTP = &confighttp.HTTPServerConfig{ + cfg.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "localhost:", } }, @@ -201,7 +201,7 @@ func TestInvalidConfig(t *testing.T) { { desc: "grpc-invalid-host", apply: func(cfg *Config) { - cfg.GRPC = &configgrpc.GRPCServerSettings{ + cfg.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "1234", Transport: "tcp", diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 38f88e9f7581b..33545b5074e91 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -73,13 +73,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, ThriftBinary: &ProtocolUDP{ @@ -112,11 +112,11 @@ func createTracesReceiver( var config configuration // Set ports if rCfg.Protocols.GRPC != nil { - config.CollectorGRPCServerSettings = *rCfg.Protocols.GRPC + config.GRPCServerConfig = *rCfg.Protocols.GRPC } if rCfg.Protocols.ThriftHTTP != nil { - config.CollectorHTTPSettings = *rCfg.ThriftHTTP + config.HTTPServerConfig = *rCfg.ThriftHTTP } if rCfg.Protocols.ThriftBinary != nil { diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index 5c0bf053ae7f8..8069a7bd5467a 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() // have to enable at least one protocol for the jaeger receiver to be created - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -80,7 +80,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -90,14 +90,14 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") - assert.Equal(t, "0.0.0.0:14250", r.(*jReceiver).config.CollectorGRPCServerSettings.NetAddr.Endpoint, "grpc port should be default") + assert.Equal(t, "0.0.0.0:14250", r.(*jReceiver).config.GRPCServerConfig.NetAddr.Endpoint, "grpc port should be default") } func TestCreateTLSGPRCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -119,7 +119,7 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.ThriftHTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -143,7 +143,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") - assert.Equal(t, "0.0.0.0:14268", r.(*jReceiver).config.CollectorHTTPSettings.Endpoint, "http port should be default") + assert.Equal(t, "0.0.0.0:14268", r.(*jReceiver).config.HTTPServerConfig.Endpoint, "http port should be default") } func TestCreateInvalidThriftBinaryEndpoint(t *testing.T) { diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 5874b016e2e8c..02428eb2afab2 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,14 +58,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 0dacaf660f299..86fd30f46e513 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -104,44 +104,44 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index c5b98832cef2c..184acc37a4b0e 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -42,8 +42,8 @@ import ( // configuration defines the behavior and the ports that // the Jaeger receiver will use. type configuration struct { - CollectorHTTPSettings confighttp.HTTPServerConfig - CollectorGRPCServerSettings configgrpc.GRPCServerSettings + HTTPServerConfig confighttp.ServerConfig + GRPCServerConfig configgrpc.ServerConfig AgentCompactThrift ProtocolUDP AgentBinaryThrift ProtocolUDP @@ -373,16 +373,16 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er return nil } - if jr.config.CollectorHTTPSettings.Endpoint != "" { - cln, err := jr.config.CollectorHTTPSettings.ToListener() + if jr.config.HTTPServerConfig.Endpoint != "" { + cln, err := jr.config.HTTPServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to Collector address %q: %w", - jr.config.CollectorHTTPSettings.Endpoint, err) + jr.config.HTTPServerConfig.Endpoint, err) } nr := mux.NewRouter() nr.HandleFunc("/api/traces", jr.HandleThriftHTTPBatch).Methods(http.MethodPost) - jr.collectorServer, err = jr.config.CollectorHTTPSettings.ToServer(host, jr.settings.TelemetrySettings, nr) + jr.collectorServer, err = jr.config.HTTPServerConfig.ToServer(host, jr.settings.TelemetrySettings, nr) if err != nil { return err } @@ -396,16 +396,16 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er }() } - if jr.config.CollectorGRPCServerSettings.NetAddr.Endpoint != "" { + if jr.config.GRPCServerConfig.NetAddr.Endpoint != "" { var err error - jr.grpc, err = jr.config.CollectorGRPCServerSettings.ToServer(host, jr.settings.TelemetrySettings) + jr.grpc, err = jr.config.GRPCServerConfig.ToServer(host, jr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err) } - ln, err := jr.config.CollectorGRPCServerSettings.ToListenerContext(ctx) + ln, err := jr.config.GRPCServerConfig.ToListenerContext(ctx) if err != nil { - return fmt.Errorf("failed to bind to gRPC address %q: %w", jr.config.CollectorGRPCServerSettings.NetAddr, err) + return fmt.Errorf("failed to bind to gRPC address %q: %w", jr.config.GRPCServerConfig.NetAddr, err) } api_v2.RegisterCollectorServiceServer(jr.grpc, jr) diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index f70f9ae547d2a..2b93b0f4f5dc4 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -78,7 +78,7 @@ func TestReception(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) // 1. Create the Jaeger receiver aka "server" config := &configuration{ - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + HTTPServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } @@ -141,7 +141,7 @@ func TestPortsNotOpen(t *testing.T) { func TestGRPCReception(t *testing.T) { // prepare config := &configuration{ - CollectorGRPCServerSettings: configgrpc.GRPCServerSettings{ + GRPCServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -157,7 +157,7 @@ func TestGRPCReception(t *testing.T) { require.NoError(t, jr.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) - conn, err := grpc.Dial(config.CollectorGRPCServerSettings.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) + conn, err := grpc.Dial(config.GRPCServerConfig.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) require.NoError(t, err) defer conn.Close() @@ -195,7 +195,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { }, } - grpcServerSettings := configgrpc.GRPCServerSettings{ + grpcServerSettings := configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -204,7 +204,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { } config := &configuration{ - CollectorGRPCServerSettings: grpcServerSettings, + GRPCServerConfig: grpcServerSettings, } sink := new(consumertest.TracesSink) @@ -337,7 +337,7 @@ func grpcFixture(t *testing.T, t1 time.Time, d1, d2 time.Duration) *api_v2.PostS func TestSampling(t *testing.T) { config := &configuration{ - CollectorGRPCServerSettings: configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + GRPCServerConfig: configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", }}, @@ -351,7 +351,7 @@ func TestSampling(t *testing.T) { require.NoError(t, jr.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) - conn, err := grpc.Dial(config.CollectorGRPCServerSettings.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.Dial(config.GRPCServerConfig.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials())) assert.NoError(t, err) defer conn.Close() diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index c728c343b8a29..938525a0f4a99 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -83,19 +83,19 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 4f07454e176bf..4c5e13a50afb8 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -153,48 +153,48 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 9bfa113a6624d..69d5029d15bb0 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,11 +43,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 4821b6421eeb4..676eeb66b7405 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 91d396ac88b6a..26c96ce49fe91 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -16,13 +16,13 @@ require ( github.com/openshift/api v3.9.0+incompatible github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,19 +84,19 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 28d6c4bcf992f..1819312c8f0b1 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -301,46 +301,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 56f520164cac1..b1adc381dc408 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -58,8 +58,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 8365ec48582c7..ea9a2c01fc032 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -258,22 +258,22 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 228eb583d2481..d6db61496eb57 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -78,19 +78,19 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index d5142ed755a5b..0676f326a75c2 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -299,46 +299,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 2695db7eac1fe..f36c4064285d9 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,9 +64,9 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 5086f7696d482..0cbb68e5881d1 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -122,24 +122,24 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index f63b6f1283e40..002942747fb16 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -17,13 +17,13 @@ require ( github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -74,12 +74,12 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 221f445ec8ede..2866931142a10 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -162,32 +162,32 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 0004c401ea8a5..5c2cd5d9e2b04 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,17 +85,17 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 8a35d9eb75d77..2b1c4b79d87c2 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -299,46 +299,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/lokireceiver/config.go b/receiver/lokireceiver/config.go index 21a9bcbda317c..66b497f278541 100644 --- a/receiver/lokireceiver/config.go +++ b/receiver/lokireceiver/config.go @@ -20,8 +20,8 @@ const ( // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - HTTP *confighttp.HTTPServerConfig `mapstructure:"http"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + HTTP *confighttp.ServerConfig `mapstructure:"http"` } // Config defines configuration for the lokireceiver receiver. diff --git a/receiver/lokireceiver/config_test.go b/receiver/lokireceiver/config_test.go index 69e780c2d4981..da1e9fdd19e18 100644 --- a/receiver/lokireceiver/config_test.go +++ b/receiver/lokireceiver/config_test.go @@ -32,13 +32,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:3600", Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:3500", }, }, @@ -48,13 +48,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "mixed"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:4600", Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "localhost:4500", }, }, diff --git a/receiver/lokireceiver/factory.go b/receiver/lokireceiver/factory.go index 6798834b852c8..c4cc246b47c2e 100644 --- a/receiver/lokireceiver/factory.go +++ b/receiver/lokireceiver/factory.go @@ -37,13 +37,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, }, diff --git a/receiver/lokireceiver/factory_test.go b/receiver/lokireceiver/factory_test.go index 337de8ffcb9c2..784662b730bda 100644 --- a/receiver/lokireceiver/factory_test.go +++ b/receiver/lokireceiver/factory_test.go @@ -25,7 +25,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: defaultGRPCBindEndpoint, Transport: "tcp", diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index fe822636f468a..7d881144e6a6f 100644 --- a/receiver/lokireceiver/go.mod +++ b/receiver/lokireceiver/go.mod @@ -15,20 +15,20 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.93.0 // indirect github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/zap v1.26.0 google.golang.org/grpc v1.61.0 ) require ( - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -66,16 +66,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index 8de87f9a40846..ad70d75348c19 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -109,44 +109,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/lokireceiver/loki_test.go b/receiver/lokireceiver/loki_test.go index ef465868b479d..10dd6d6b2cbe0 100644 --- a/receiver/lokireceiver/loki_test.go +++ b/receiver/lokireceiver/loki_test.go @@ -88,7 +88,7 @@ func sendToCollector(endpoint string, contentType string, contentEncoding string func startGRPCServer(t *testing.T) (*grpc.ClientConn, *consumertest.LogsSink) { config := &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -115,7 +115,7 @@ func startHTTPServer(t *testing.T) (string, *consumertest.LogsSink) { addr := testutil.GetAvailableLocalAddress(t) config := &Config{ Protocols: Protocols{ - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: addr, }, }, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index b4a71f1425e65..bfc0ce033b907 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index f4f26bdf01ce9..baec9b6a14f6d 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -138,22 +138,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 8632f02f55918..d010a454db88c 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -12,15 +12,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 go.mongodb.org/atlas v0.36.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -60,9 +60,9 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 27403ac30af45..8b9b15f6fc1b4 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -89,30 +89,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/atlas v0.36.0 h1:m05S3AO7zkl+bcG1qaNsEKBnAqnKx2FDwLooHpIG3j4= go.mongodb.org/atlas v0.36.0/go.mod h1:nfPldE9dSama6G2IbIzmEza02Ly7yFZjMMVscaM0uEc= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index a2adea37f6fb8..cbd978f1778c8 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 go.mongodb.org/mongo-driver v1.13.1 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -90,8 +90,8 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 08a1e73395b4b..1897b81a124b5 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -159,28 +159,28 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 94cd97f156cac..f5110a93ed3be 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -80,8 +80,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 7768c948ae237..0ed26c96475c9 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -140,26 +140,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index 46f8a31b5ffb0..6358a2abd8c7d 100644 --- a/receiver/namedpipereceiver/go.mod +++ b/receiver/namedpipereceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -44,11 +44,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 1b92bba191a17..383e432b84c37 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -76,24 +76,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 3c2e9ad5a65ec..8bb500012cc70 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -12,6 +12,6 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 58ac655cad660..5b959c5e256bc 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -30,7 +30,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:80/status", Timeout: 10 * time.Second, }, diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 912e4b6ef4975..78dccb14e47c7 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -83,15 +83,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 7184d6052acbc..ba56bbb47002c 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -148,38 +148,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go index e57bbf223cf11..731d738420ff4 100644 --- a/receiver/nginxreceiver/scraper.go +++ b/receiver/nginxreceiver/scraper.go @@ -53,7 +53,7 @@ func (r *nginxScraper) scrape(context.Context) (pmetric.Metrics, error) { // Init client in scrape method in case there are transient errors in the constructor. if r.client == nil { var err error - r.client, err = client.NewNginxClient(r.httpClient, r.cfg.HTTPClientConfig.Endpoint) + r.client, err = client.NewNginxClient(r.httpClient, r.cfg.ClientConfig.Endpoint) if err != nil { r.client = nil return pmetric.Metrics{}, err diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index c4ef7cc2ae1a5..3d4f76110abff 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -58,7 +58,7 @@ func TestScraperError(t *testing.T) { })) t.Run("404", func(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nginxMock.URL + "/badpath", }, }) @@ -70,7 +70,7 @@ func TestScraperError(t *testing.T) { t.Run("parse error", func(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nginxMock.URL + "/status", }, }) @@ -83,7 +83,7 @@ func TestScraperError(t *testing.T) { func TestScraperFailedStart(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/nsxtreceiver/client.go b/receiver/nsxtreceiver/client.go index dec6e50e05ec3..da00d474efc3a 100644 --- a/receiver/nsxtreceiver/client.go +++ b/receiver/nsxtreceiver/client.go @@ -41,7 +41,7 @@ var ( ) func newClient(c *Config, settings component.TelemetrySettings, host component.Host, logger *zap.Logger) (*nsxClient, error) { - client, err := c.HTTPClientConfig.ToClient(host, settings) + client, err := c.ClientConfig.ToClient(host, settings) if err != nil { return nil, err } diff --git a/receiver/nsxtreceiver/client_test.go b/receiver/nsxtreceiver/client_test.go index 663a4e5508613..64d18174b3085 100644 --- a/receiver/nsxtreceiver/client_test.go +++ b/receiver/nsxtreceiver/client_test.go @@ -27,7 +27,7 @@ const ( func TestNewClientFailureToParse(t *testing.T) { _, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://\x00", }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -37,7 +37,7 @@ func TestNewClientFailureToParse(t *testing.T) { func TestTransportNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -50,7 +50,7 @@ func TestTransportNodes(t *testing.T) { func TestClusterNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -63,7 +63,7 @@ func TestClusterNodes(t *testing.T) { func TestClusterNodeInterface(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -76,7 +76,7 @@ func TestClusterNodeInterface(t *testing.T) { func TestTransportNodeInterface(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -89,7 +89,7 @@ func TestTransportNodeInterface(t *testing.T) { func TestTransportNodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -102,7 +102,7 @@ func TestTransportNodeStatus(t *testing.T) { func TestClusterNodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -115,7 +115,7 @@ func TestClusterNodeStatus(t *testing.T) { func TestTransportNodeInterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -128,7 +128,7 @@ func TestTransportNodeInterfaceStatus(t *testing.T) { func TestManagerNodeInterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -141,7 +141,7 @@ func TestManagerNodeInterfaceStatus(t *testing.T) { func TestDoRequestBadUrl(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -155,7 +155,7 @@ func TestPermissionDenied_ClusterNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -169,7 +169,7 @@ func TestPermissionDenied_Interfaces(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -183,7 +183,7 @@ func TestPermissionDenied_InterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -197,7 +197,7 @@ func TestPermissionDenied_NodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -211,7 +211,7 @@ func TestPermissionDenied_TransportNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -225,7 +225,7 @@ func TestInternalServerError(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Username: user500, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) diff --git a/receiver/nsxtreceiver/config.go b/receiver/nsxtreceiver/config.go index 6f093715623f9..ea2d8bcd93881 100644 --- a/receiver/nsxtreceiver/config.go +++ b/receiver/nsxtreceiver/config.go @@ -19,7 +19,7 @@ import ( // Config is the configuration for the NSX receiver type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index b85b1091d1810..f03765a819d47 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -33,7 +33,7 @@ func TestMetricValidation(t *testing.T) { { desc: "not valid scheme", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "wss://not-supported-websockets", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -43,7 +43,7 @@ func TestMetricValidation(t *testing.T) { { desc: "unparseable url", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -54,7 +54,7 @@ func TestMetricValidation(t *testing.T) { desc: "username not provided", cfg: &Config{ Password: "password", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -65,7 +65,7 @@ func TestMetricValidation(t *testing.T) { desc: "password not provided", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 73bb55e0506a2..d02a01048af29 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,15 +52,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 2f91b85805db2..46e39fa1ccc74 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -82,38 +82,38 @@ github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aR github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/nsxtreceiver/scraper_test.go b/receiver/nsxtreceiver/scraper_test.go index ff21cc9eb8ee3..8e11a7f15df03 100644 --- a/receiver/nsxtreceiver/scraper_test.go +++ b/receiver/nsxtreceiver/scraper_test.go @@ -106,7 +106,7 @@ func TestStartClientAlreadySet(t *testing.T) { scraper := newScraper( &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: mockClient.URL, }, }, @@ -120,7 +120,7 @@ func TestStartBadUrl(t *testing.T) { scraper := newScraper( &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, }, @@ -134,7 +134,7 @@ func TestStartBadUrl(t *testing.T) { func TestScraperRecordNoStat(_ *testing.T) { scraper := newScraper( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index f643b368a70d2..33d0c601f4644 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for OpenCensus receiver. type Config struct { // Configures the receiver server protocol. - configgrpc.GRPCServerSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + configgrpc.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // CorsOrigins are the allowed CORS origins for HTTP/JSON requests to grpc-gateway adapter // for the OpenCensus receiver. See github.com/rs/cors @@ -26,7 +26,7 @@ func (cfg *Config) buildOptions() []ocOption { opts = append(opts, withCorsOrigins(cfg.CorsOrigins)) } - opts = append(opts, withGRPCServerSettings(cfg.GRPCServerSettings)) + opts = append(opts, withGRPCServerSettings(cfg.ServerConfig)) return opts } diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index aee5d331fa655..984cbbc74e1af 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:9090", Transport: "tcp", @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "keepalive"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "msg-size-conc-connect-max-idle"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -89,7 +89,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tlscredentials"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -107,7 +107,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "cors"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "uds"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "/tmp/opencensus.sock", Transport: "unix", diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index dfe3d209faae6..b674b935c4009 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -30,7 +30,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(grpcPort), Transport: "tcp", diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index d230063f572c2..b27c8fc71838f 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateTracesReceiver(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", } - defaultGRPCSettings := configgrpc.GRPCServerSettings{ + defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, } tests := []struct { @@ -55,13 +55,13 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "default", cfg: &Config{ - GRPCServerSettings: defaultGRPCSettings, + ServerConfig: defaultGRPCSettings, }, }, { name: "invalid_port", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:112233", Transport: "tcp", @@ -73,7 +73,7 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "max-msg-size-and-concurrent-connections", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: defaultNetAddr, MaxRecvMsgSizeMiB: 32, MaxConcurrentStreams: 16, @@ -103,7 +103,7 @@ func TestCreateMetricsReceiver(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", } - defaultGRPCSettings := configgrpc.GRPCServerSettings{ + defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, } @@ -115,13 +115,13 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "default", cfg: &Config{ - GRPCServerSettings: defaultGRPCSettings, + ServerConfig: defaultGRPCSettings, }, }, { name: "invalid_address", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "327.0.0.1:1122", Transport: "tcp", @@ -133,7 +133,7 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "keepalive", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: defaultNetAddr, Keepalive: &configgrpc.KeepaliveServerConfig{ ServerParameters: &configgrpc.KeepaliveServerParameters{ diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index ea8d85be13ffd..5f7c27ed311b1 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/rs/cors v1.10.1 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 @@ -60,16 +60,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index e3d9116ec8396..9d4de7305be96 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -120,42 +120,42 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index fa36aaf37b6e4..896dfd7f8c5fc 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -36,7 +36,7 @@ type ocReceiver struct { serverHTTP *http.Server gatewayMux *gatewayruntime.ServeMux corsOrigins []string - grpcServerSettings configgrpc.GRPCServerSettings + grpcServerSettings configgrpc.ServerConfig traceReceiver *octrace.Receiver metricsReceiver *ocmetrics.Receiver diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 98a6f812abe08..86a5969e7e89c 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -601,7 +601,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { func TestInvalidTLSCredentials(t *testing.T) { cfg := Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ CertFile: "willfail", diff --git a/receiver/opencensusreceiver/options.go b/receiver/opencensusreceiver/options.go index 72867d940321c..3851fca059f4c 100644 --- a/receiver/opencensusreceiver/options.go +++ b/receiver/opencensusreceiver/options.go @@ -30,12 +30,12 @@ func withCorsOrigins(origins []string) ocOption { return &corsOrigins{origins: origins} } -type grpcServerSettings configgrpc.GRPCServerSettings +type grpcServerSettings configgrpc.ServerConfig -func withGRPCServerSettings(settings configgrpc.GRPCServerSettings) ocOption { +func withGRPCServerSettings(settings configgrpc.ServerConfig) ocOption { gsvOpts := grpcServerSettings(settings) return gsvOpts } func (gsvo grpcServerSettings) withReceiver(ocr *ocReceiver) { - ocr.grpcServerSettings = configgrpc.GRPCServerSettings(gsvo) + ocr.grpcServerSettings = configgrpc.ServerConfig(gsvo) } diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index b30ee707df7b4..4682e0fa06702 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/sijms/go-ora/v2 v2.8.6 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index d4b83474ebd46..e0d682730c107 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -61,20 +61,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/osqueryreceiver/go.mod b/receiver/osqueryreceiver/go.mod index 13ff9bbf5d773..ff6687200bf8a 100644 --- a/receiver/osqueryreceiver/go.mod +++ b/receiver/osqueryreceiver/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -25,11 +25,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect diff --git a/receiver/osqueryreceiver/go.sum b/receiver/osqueryreceiver/go.sum index 8d896b3e0ae18..6239d91b02fa1 100644 --- a/receiver/osqueryreceiver/go.sum +++ b/receiver/osqueryreceiver/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index b303f38d1e2a6..795abc23c9765 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,10 +45,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index b411914823568..46a35c197ecba 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -77,24 +77,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 5715070fe1aee..acf2bfa3a05b8 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 909ecf79c04e2..9f2bf3139e69a 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -58,24 +58,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 0dd1083aecc67..24c2ca20aa14c 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,8 +85,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 1aea73055c932..6753a8a09b28a 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -143,28 +143,28 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 53cabaeb0dfb4..d1fb08aad25f2 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -13,17 +13,17 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -156,19 +156,19 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 07d82ae3d5440..dd8fb0d165a14 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -539,56 +539,56 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index f561edc90d869..f1706c858f729 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -66,7 +66,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 4aaa7417f5ca6..111bb87d088a7 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -412,23 +412,23 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/purefareceiver/config.go b/receiver/purefareceiver/config.go index 0b7e2b2aeb364..fe2d0b9e35628 100644 --- a/receiver/purefareceiver/config.go +++ b/receiver/purefareceiver/config.go @@ -18,7 +18,7 @@ var _ component.Config = (*Config)(nil) // Config relating to Array Metric Scraper. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Settings contains settings for the individual scrapers Settings *Settings `mapstructure:"settings"` diff --git a/receiver/purefareceiver/factory.go b/receiver/purefareceiver/factory.go index d743b861bc1d5..ff0f87be15dc9 100644 --- a/receiver/purefareceiver/factory.go +++ b/receiver/purefareceiver/factory.go @@ -28,8 +28,8 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ArrayName: "foobar.example.com", - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ArrayName: "foobar.example.com", + ClientConfig: confighttp.ClientConfig{}, Settings: &Settings{ ReloadIntervals: &ReloadIntervals{ Array: 15 * time.Second, diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index bba86f8dd8330..4b58486f84c92 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -132,16 +132,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 2a3c189dc886b..23f48d2d95622 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/purefbreceiver/config.go b/receiver/purefbreceiver/config.go index a1a7376a6f0b9..5e6ce50d35aa2 100644 --- a/receiver/purefbreceiver/config.go +++ b/receiver/purefbreceiver/config.go @@ -18,7 +18,7 @@ var _ component.Config = (*Config)(nil) // Config relating to Array Metric Scraper. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Settings contains settings for the individual scrapers Settings *Settings `mapstructure:"settings"` diff --git a/receiver/purefbreceiver/factory.go b/receiver/purefbreceiver/factory.go index 5451b501f3dab..5795d59e27e20 100644 --- a/receiver/purefbreceiver/factory.go +++ b/receiver/purefbreceiver/factory.go @@ -28,7 +28,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, Settings: &Settings{ ReloadIntervals: &ReloadIntervals{ Array: 15 * time.Second, diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 84711613c780f..6daab3d57490e 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -132,16 +132,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 2a3c189dc886b..23f48d2d95622 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/rabbitmqreceiver/client_test.go b/receiver/rabbitmqreceiver/client_test.go index 19bd97c56fc85..b71f53027b2b7 100644 --- a/receiver/rabbitmqreceiver/client_test.go +++ b/receiver/rabbitmqreceiver/client_test.go @@ -39,7 +39,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -56,7 +56,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/rabbitmqreceiver/config.go b/receiver/rabbitmqreceiver/config.go index 1581d94e8ee1b..d81af24393313 100644 --- a/receiver/rabbitmqreceiver/config.go +++ b/receiver/rabbitmqreceiver/config.go @@ -29,7 +29,7 @@ const defaultEndpoint = "http://localhost:15672" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/rabbitmqreceiver/config_test.go b/receiver/rabbitmqreceiver/config_test.go index f15598091f4e3..c914ebc30973d 100644 --- a/receiver/rabbitmqreceiver/config_test.go +++ b/receiver/rabbitmqreceiver/config_test.go @@ -27,7 +27,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -41,7 +41,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -54,7 +54,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -68,7 +68,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -81,7 +81,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index e3e33950e9d3b..68c7c94897781 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index 83a960da6bf72..a6bb4b9b315d5 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 0215323fde4a2..878993f9ab8ae 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index ee4eee27afb0d..90d307dfab2d7 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index 6e09c2ee56b4f..f97c285fbea8a 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -35,7 +35,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &rabbitmqScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -52,7 +52,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &rabbitmqScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index db8b989787bb4..3eda452a0f38c 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,14 +9,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,13 +64,13 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index b5dcaf5f73234..4b6176dede8b5 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -139,39 +139,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 4a3bf0d2b36d4..84220dd44a296 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/redis/go-redis/v9 v9.4.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -81,8 +81,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index f51ca9469227b..671187c20274f 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -144,26 +144,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/riakreceiver/client_test.go b/receiver/riakreceiver/client_test.go index 8d9e369e0d592..a8967701584fa 100644 --- a/receiver/riakreceiver/client_test.go +++ b/receiver/riakreceiver/client_test.go @@ -35,7 +35,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -49,7 +49,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/riakreceiver/config.go b/receiver/riakreceiver/config.go index 519c07de8e06a..24634aca000c1 100644 --- a/receiver/riakreceiver/config.go +++ b/receiver/riakreceiver/config.go @@ -29,7 +29,7 @@ const defaultEndpoint = "http://localhost:8098" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` diff --git a/receiver/riakreceiver/config_test.go b/receiver/riakreceiver/config_test.go index 301cbc66f3bb0..62ab4082daf58 100644 --- a/receiver/riakreceiver/config_test.go +++ b/receiver/riakreceiver/config_test.go @@ -24,7 +24,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -39,7 +39,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -53,7 +53,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -68,7 +68,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -82,7 +82,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index bd8d12ed8fb6a..07c8d898ed885 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 45d1b964d1a29..2ca3de378967c 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 5b47b880f1734..66cfb379628df 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index ee4eee27afb0d..90d307dfab2d7 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index dbd4bc7be14e9..a6b65e1632c75 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -36,7 +36,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &riakScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -54,7 +54,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &riakScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index bfd70612d1024..26da2b4509e95 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 59744b15d20d2..e7eb2947f3e00 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -68,26 +68,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sapmreceiver/config.go b/receiver/sapmreceiver/config.go index 7314510e28f34..689c8a3399b83 100644 --- a/receiver/sapmreceiver/config.go +++ b/receiver/sapmreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for SAPM receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` } diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index 3d51a97bd41a5..8dda68c3e374c 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", }, }, @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "passthrough"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index 508106cb5ea43..367ba31a9e53a 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -35,7 +35,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 60d626df371ba..6f4a255d66b5a 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -53,17 +53,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index b333a290bf860..af6c81c31ef3b 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -82,44 +82,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index dfae8ef4ef577..0d7b5be9d00c7 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -156,7 +156,7 @@ func (sr *sapmReceiver) Start(_ context.Context, host component.Host) error { return nil } // set up the listener - ln, err := sr.config.HTTPServerConfig.ToListener() + ln, err := sr.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", sr.config.Endpoint, err) } @@ -166,7 +166,7 @@ func (sr *sapmReceiver) Start(_ context.Context, host component.Host) error { nr.HandleFunc(sapmprotocol.TraceEndpointV2, sr.HTTPHandlerFunc) // create a server with the handler - sr.server, err = sr.config.HTTPServerConfig.ToServer(host, sr.settings, nr) + sr.server, err = sr.config.ServerConfig.ToServer(host, sr.settings, nr) if err != nil { return err } diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 3bc3fbef90dd2..4da189a3f6b3c 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -278,7 +278,7 @@ func TestReception(t *testing.T) { args: args{ // 1. Create the SAPM receiver aka "server" config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, }, @@ -292,7 +292,7 @@ func TestReception(t *testing.T) { name: "receive compressed sapm", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, }, @@ -306,7 +306,7 @@ func TestReception(t *testing.T) { name: "connect via TLS zstd compressed sapm", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: tlsAddress, TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -381,7 +381,7 @@ func TestAccessTokenPassthrough(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ diff --git a/receiver/signalfxreceiver/config.go b/receiver/signalfxreceiver/config.go index 56b7824bfaab9..5330baccec95d 100644 --- a/receiver/signalfxreceiver/config.go +++ b/receiver/signalfxreceiver/config.go @@ -17,18 +17,18 @@ var ( // Config defines configuration for the SignalFx receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` } // Validate verifies that the endpoint is valid and the configured port is not 0 func (rCfg *Config) Validate() error { - if rCfg.HTTPServerConfig.Endpoint == "" { + if rCfg.ServerConfig.Endpoint == "" { return errEmptyEndpoint } - _, err := extractPortFromEndpoint(rCfg.HTTPServerConfig.Endpoint) + _, err := extractPortFromEndpoint(rCfg.ServerConfig.Endpoint) if err != nil { return err } diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index 77609cb36e0d7..e1d3f55cca043 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9943", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:9943", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index a026a2afab931..467390d8c5b51 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -38,7 +38,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 74dee6a40c040..3c43386e89f70 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.93.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -66,17 +66,17 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 71719634e8762..2fd93ed3d9101 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -113,44 +113,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 6867dc32abe29..597679f59233a 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -125,7 +125,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { } // set up the listener - ln, err := r.config.HTTPServerConfig.ToListener() + ln, err := r.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", r.config.Endpoint, err) } @@ -134,7 +134,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { mx.HandleFunc("/v2/datapoint", r.handleDatapointReq) mx.HandleFunc("/v2/event", r.handleEventReq) - r.server, err = r.config.HTTPServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) + r.server, err = r.config.ServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) if err != nil { return err } diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 7a9706ef06fab..c5df61a7a8f52 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -67,7 +67,7 @@ func Test_signalfxeceiver_New(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, @@ -536,7 +536,7 @@ func Test_sfxReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.HTTPServerConfig.TLSSetting = &configtls.TLSServerSetting{ + cfg.ServerConfig.TLSSetting = &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", diff --git a/receiver/simpleprometheusreceiver/config.go b/receiver/simpleprometheusreceiver/config.go index acbf771f50723..e39fd5b7bb42c 100644 --- a/receiver/simpleprometheusreceiver/config.go +++ b/receiver/simpleprometheusreceiver/config.go @@ -12,8 +12,8 @@ import ( // Config defines configuration for simple prometheus receiver. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - // Deprecated: [v0.55.0] Use confighttp.HTTPClientConfig instead. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + // Deprecated: [v0.55.0] Use confighttp.ClientConfig instead. httpConfig `mapstructure:",squash"` // CollectionInterval is the interval at which metrics should be collected CollectionInterval time.Duration `mapstructure:"collection_interval"` diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 5bcf1b085b194..9e4f331323198 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "all_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "partial_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "partial_tls_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", }, CollectionInterval: 30 * time.Second, diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index f0e999b220523..976ad36d5cc5c 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index cd48d7e3f6f06..00641c353535b 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -130,17 +130,17 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index c9a756016a48f..37030fcd1d874 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index 6fc8abe414de0..7fed4cd52ee04 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -56,7 +56,7 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component. func getPrometheusConfigWrapper(cfg *Config, params receiver.CreateSettings) (*prometheusreceiver.Config, error) { if cfg.TLSEnabled { params.Logger.Warn("the `tls_config` and 'tls_enabled' settings are deprecated, please use `tls` instead") - cfg.HTTPClientConfig.TLSSetting = configtls.TLSClientSetting{ + cfg.ClientConfig.TLSSetting = configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: cfg.TLSConfig.CAFile, CertFile: cfg.TLSConfig.CertFile, diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 89cf08d91320c..87e40f01ff0c9 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -75,7 +75,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test without TLS", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -113,7 +113,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test with TLS", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -158,7 +158,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test with TLS - default CA", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", }, CollectionInterval: 10 * time.Second, @@ -219,7 +219,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { InsecureSkipVerify: true, }, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -266,7 +266,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -307,7 +307,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -348,7 +348,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, diff --git a/receiver/skywalkingreceiver/config.go b/receiver/skywalkingreceiver/config.go index 0a297425ccd48..02afbd1a8a437 100644 --- a/receiver/skywalkingreceiver/config.go +++ b/receiver/skywalkingreceiver/config.go @@ -19,8 +19,8 @@ const ( // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - HTTP *confighttp.HTTPServerConfig `mapstructure:"http"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + HTTP *confighttp.ServerConfig `mapstructure:"http"` } // Config defines configuration for skywalking receiver. diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index 0b5dd8e2d9c04..70052571d4253 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ Protocols: Protocols{ - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12801", }, }, @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 9b96d191629c6..a1f0a493d69a8 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -46,13 +46,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, }, diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 5bae71cfd7042..f86c37d0cee3c 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -41,7 +41,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() // have to enable at least one protocol for the skywalking receiver to be created - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -86,7 +86,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -104,7 +104,7 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -126,7 +126,7 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.HTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -146,7 +146,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.HTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", } set := receivertest.NewNopCreateSettings() diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 356e7e5b9a484..6734dcc79bd6d 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,15 +58,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index bee1be96cd118..919d8c61f0714 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -129,44 +129,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/skywalkingreceiver/skywalking_receiver.go b/receiver/skywalkingreceiver/skywalking_receiver.go index 7148682547c7b..1da974c42fef7 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver.go +++ b/receiver/skywalkingreceiver/skywalking_receiver.go @@ -33,9 +33,9 @@ import ( // the Skywalking receiver will use. type configuration struct { CollectorHTTPPort int - CollectorHTTPSettings confighttp.HTTPServerConfig + CollectorHTTPSettings confighttp.ServerConfig CollectorGRPCPort int - CollectorGRPCServerSettings configgrpc.GRPCServerSettings + CollectorGRPCServerSettings configgrpc.ServerConfig } // Receiver type is used to receive spans that were originally intended to be sent to Skywaking. diff --git a/receiver/skywalkingreceiver/skywalking_receiver_test.go b/receiver/skywalkingreceiver/skywalking_receiver_test.go index bebbb0d2efeb4..ea8a1d467b4f3 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver_test.go +++ b/receiver/skywalkingreceiver/skywalking_receiver_test.go @@ -79,7 +79,7 @@ func TestStartAndShutdown(t *testing.T) { port := 12800 config := &configuration{ CollectorHTTPPort: port, - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + CollectorHTTPSettings: confighttp.ServerConfig{ Endpoint: fmt.Sprintf(":%d", port), }, } @@ -134,7 +134,7 @@ func TestGRPCReception(t *testing.T) { func TestHttpReception(t *testing.T) { config := &configuration{ CollectorHTTPPort: 12800, - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + CollectorHTTPSettings: confighttp.ServerConfig{ Endpoint: fmt.Sprintf(":%d", 12800), }, } diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index c33a8f07660a4..8e4c9a3b69f25 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,15 +84,15 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 3c925e8dfd1bf..e0e62352da0bb 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -185,41 +185,41 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 8b9799245ff46..e82c4334edbf4 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/snowflakedb/gosnowflake v1.7.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -81,8 +81,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index 06dc07814d5cf..4a3b703a305ce 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -170,22 +170,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index f7a3b0c0396bf..4fb96b83c9341 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/Azure/go-amqp v1.0.4 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 642eeac1191c5..3dab1df3461a6 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -102,22 +102,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/splunkenterprisereceiver/client.go b/receiver/splunkenterprisereceiver/client.go index 33d878de6ae48..dcd1ee89f48c4 100644 --- a/receiver/splunkenterprisereceiver/client.go +++ b/receiver/splunkenterprisereceiver/client.go @@ -19,7 +19,7 @@ type splunkEntClient struct { } func newSplunkEntClient(cfg *Config, h component.Host, s component.TelemetrySettings) (*splunkEntClient, error) { - client, err := cfg.HTTPClientConfig.ToClient(h, s) + client, err := cfg.ClientConfig.ToClient(h, s) if err != nil { return nil, err } diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 9126cc9266163..3c876604227e1 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -34,7 +34,7 @@ func (m *mockHost) GetExtensions() map[component.ID]component.Component { func TestClientCreation(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), @@ -65,7 +65,7 @@ func TestClientCreation(t *testing.T) { // ad-hoc searches func TestClientCreateRequest(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), @@ -147,7 +147,7 @@ func TestClientCreateRequest(t *testing.T) { // createAPIRequest creates a request for api calls i.e. to introspection endpoint func TestAPIRequestCreate(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index a058c839bf5ba..9720851aa21de 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -22,7 +22,7 @@ var ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } @@ -46,7 +46,7 @@ func (cfg *Config) Validate() (errors error) { } } - if cfg.HTTPClientConfig.Auth.AuthenticatorID.Name() == "" { + if cfg.ClientConfig.Auth.AuthenticatorID.Name() == "" { errors = multierr.Append(errors, errMissingAuthExtension) } diff --git a/receiver/splunkenterprisereceiver/factory.go b/receiver/splunkenterprisereceiver/factory.go index 080ccfc2a8e32..ec11df83041af 100644 --- a/receiver/splunkenterprisereceiver/factory.go +++ b/receiver/splunkenterprisereceiver/factory.go @@ -24,7 +24,7 @@ const ( func createDefaultConfig() component.Config { // Default HttpClient settings - httpCfg := confighttp.NewDefaultHTTPClientConfig() + httpCfg := confighttp.NewDefaultClientConfig() httpCfg.Headers = map[string]configopaque.String{ "Content-Type": "application/x-www-form-urlencoded", } @@ -35,7 +35,7 @@ func createDefaultConfig() component.Config { scfg.Timeout = defaultMaxSearchWaitTime return &Config{ - HTTPClientConfig: httpCfg, + ClientConfig: httpCfg, ScraperControllerSettings: scfg, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } diff --git a/receiver/splunkenterprisereceiver/factory_test.go b/receiver/splunkenterprisereceiver/factory_test.go index 7d38847722db1..c0f449f075511 100644 --- a/receiver/splunkenterprisereceiver/factory_test.go +++ b/receiver/splunkenterprisereceiver/factory_test.go @@ -24,13 +24,13 @@ func TestFactoryCreate(t *testing.T) { } func TestDefaultConfig(t *testing.T) { - cfg := confighttp.NewDefaultHTTPClientConfig() + cfg := confighttp.NewDefaultClientConfig() cfg.Headers = map[string]configopaque.String{ "Content-Type": "application/x-www-form-urlencoded", } expectedConf := &Config{ - HTTPClientConfig: cfg, + ClientConfig: cfg, ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Minute, InitialDelay: 1 * time.Second, diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index 10fe9a84f231b..e3cab9e9e6f88 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index 3dbcfbd618afb..e907ff4c82dd8 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index 7626032852b43..8a9a994cde1a0 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -84,7 +84,7 @@ func TestScraper(t *testing.T) { metricsettings.Metrics.SplunkServerIntrospectionQueuesCurrentBytes.Enabled = true cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), diff --git a/receiver/splunkhecreceiver/config.go b/receiver/splunkhecreceiver/config.go index dad82a5470f2e..095151aa62887 100644 --- a/receiver/splunkhecreceiver/config.go +++ b/receiver/splunkhecreceiver/config.go @@ -18,7 +18,7 @@ const ( // Config defines configuration for the Splunk HEC receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` // RawPath for raw data collection, default is '/services/collector/raw' diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index a7c637733497a..22a73fbd3a0d4 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8088", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:8088", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 54e68123ad0f5..7bce66a2d0bb5 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() receiver.Factory { // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{}, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 1ee52e2d48824..06e079823bcdd 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -57,16 +57,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index ea6c3a2689fe9..1d879a5958590 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -142,44 +142,44 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index 7126bc1a42d41..f5db2c7532cde 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -189,7 +189,7 @@ func (r *splunkReceiver) Start(_ context.Context, host component.Host) error { var ln net.Listener // set up the listener - ln, err := r.config.HTTPServerConfig.ToListener() + ln, err := r.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", r.config.Endpoint, err) } @@ -202,7 +202,7 @@ func (r *splunkReceiver) Start(_ context.Context, host component.Host) error { } mx.NewRoute().HandlerFunc(r.handleReq) - r.server, err = r.config.HTTPServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) + r.server, err = r.config.ServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) if err != nil { return err } diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index c596a6bd86fa0..716fed93c4159 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -83,7 +83,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, @@ -143,7 +143,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 77d1d78e48ecd..5cb5e52f780b7 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -11,12 +11,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -132,9 +132,9 @@ require ( github.com/valyala/fastjson v1.6.4 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 1fbd2f77608cd..2d49ee03930c8 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -288,24 +288,24 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 16074b803d4df..05646d63e3272 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index f8f112373c33b..005c6c5aa61ae 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -64,20 +64,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index 7299dd8ca9204..7a37a96caab93 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/pkg/sftp v1.13.6 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.18.0 @@ -25,8 +25,8 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect ) diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index f95efc1b615db..5bc80b77d105f 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -67,24 +67,24 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index dc62e6a44d6ea..605db1008de31 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -46,8 +46,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 507f77ff86484..c868d1f72f12c 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -62,25 +62,25 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 490266d2586ca..f61fd19b1576a 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,12 +46,12 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 82491e7b66c3b..bb5283345d8a1 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -78,28 +78,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 047adbcbcde2b..486cc94c69c98 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,13 +45,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 82491e7b66c3b..bb5283345d8a1 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -78,28 +78,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index f73f42f6b443c..425f3f3044f96 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,11 +43,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 4821b6421eeb4..676eeb66b7405 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index f658a27207438..cc3a461e526fa 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmware/govmomi v0.34.2 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,8 +84,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index fac18b1103c29..9ceb7bd2b39a2 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -146,26 +146,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 71d887ec9257c..45b68f23bfb10 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index c78f7f0e1875f..73a07b4b0796a 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -60,24 +60,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/webhookeventreceiver/config.go b/receiver/webhookeventreceiver/config.go index 7c1ef97175ee3..b79570ad9765c 100644 --- a/receiver/webhookeventreceiver/config.go +++ b/receiver/webhookeventreceiver/config.go @@ -20,12 +20,12 @@ var ( // Config defines configuration for the Generic Webhook receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - ReadTimeout string `mapstructure:"read_timeout"` // wait time for reading request headers in ms. Default is twenty seconds. - WriteTimeout string `mapstructure:"write_timeout"` // wait time for writing request response in ms. Default is twenty seconds. - Path string `mapstructure:"path"` // path for data collection. Default is :/services/collector - HealthPath string `mapstructure:"health_path"` // path for health check api. Default is /services/collector/health - RequiredHeader RequiredHeader `mapstructure:"required_header"` // optional setting to set a required header for all requests to have + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + ReadTimeout string `mapstructure:"read_timeout"` // wait time for reading request headers in ms. Default is twenty seconds. + WriteTimeout string `mapstructure:"write_timeout"` // wait time for writing request response in ms. Default is twenty seconds. + Path string `mapstructure:"path"` // path for data collection. Default is :/services/collector + HealthPath string `mapstructure:"health_path"` // path for health check api. Default is /services/collector/health + RequiredHeader RequiredHeader `mapstructure:"required_header"` // optional setting to set a required header for all requests to have } type RequiredHeader struct { @@ -38,7 +38,7 @@ func (cfg *Config) Validate() error { maxReadWriteTimeout, _ := time.ParseDuration("10s") - if cfg.HTTPServerConfig.Endpoint == "" { + if cfg.ServerConfig.Endpoint == "" { errs = multierr.Append(errs, errMissingEndpointFromConfig) } diff --git a/receiver/webhookeventreceiver/config_test.go b/receiver/webhookeventreceiver/config_test.go index 79f64a455ad33..3e76dff3c5b70 100644 --- a/receiver/webhookeventreceiver/config_test.go +++ b/receiver/webhookeventreceiver/config_test.go @@ -35,7 +35,7 @@ func TestValidateConfig(t *testing.T) { desc: "Missing valid endpoint", expect: errMissingEndpointFromConfig, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, }, @@ -44,7 +44,7 @@ func TestValidateConfig(t *testing.T) { desc: "ReadTimeout exceeds maximum value", expect: errReadTimeoutExceedsMaxValue, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, ReadTimeout: "14s", @@ -54,7 +54,7 @@ func TestValidateConfig(t *testing.T) { desc: "WriteTimeout exceeds maximum value", expect: errWriteTimeoutExceedsMaxValue, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, WriteTimeout: "14s", @@ -64,7 +64,7 @@ func TestValidateConfig(t *testing.T) { desc: "RequiredHeader does not contain both a key and a value", expect: errRequiredHeader, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, RequiredHeader: RequiredHeader{ @@ -77,7 +77,7 @@ func TestValidateConfig(t *testing.T) { desc: "RequiredHeader does not contain both a key and a value", expect: errRequiredHeader, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, RequiredHeader: RequiredHeader{ @@ -90,7 +90,7 @@ func TestValidateConfig(t *testing.T) { desc: "Multiple invalid configs", expect: errs, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, WriteTimeout: "14s", @@ -123,7 +123,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) expect := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8080", }, ReadTimeout: "500ms", diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index 7b0ee21dab68b..aa2ff068650d0 100644 --- a/receiver/webhookeventreceiver/go.mod +++ b/receiver/webhookeventreceiver/go.mod @@ -6,12 +6,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,16 +46,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index d3b51bd6ad41b..424d79b46d8ee 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -72,38 +72,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/webhookeventreceiver/receiver.go b/receiver/webhookeventreceiver/receiver.go index 67b77d1ef9809..24cd0a5715578 100644 --- a/receiver/webhookeventreceiver/receiver.go +++ b/receiver/webhookeventreceiver/receiver.go @@ -89,7 +89,7 @@ func (er *eventReceiver) Start(_ context.Context, host component.Host) error { } // create listener from config - ln, err := er.cfg.HTTPServerConfig.ToListener() + ln, err := er.cfg.ServerConfig.ToListener() if err != nil { return err } @@ -101,7 +101,7 @@ func (er *eventReceiver) Start(_ context.Context, host component.Host) error { router.GET(er.cfg.HealthPath, er.handleHealthCheck) // webhook server standup and configuration - er.server, err = er.cfg.HTTPServerConfig.ToServer(host, er.settings.TelemetrySettings, router) + er.server, err = er.cfg.ServerConfig.ToServer(host, er.settings.TelemetrySettings, router) if err != nil { return err } diff --git a/receiver/webhookeventreceiver/receiver_test.go b/receiver/webhookeventreceiver/receiver_test.go index d6feac98c5b7c..be712a853c8ee 100644 --- a/receiver/webhookeventreceiver/receiver_test.go +++ b/receiver/webhookeventreceiver/receiver_test.go @@ -41,7 +41,7 @@ func TestCreateNewLogReceiver(t *testing.T) { { desc: "User defined config success", cfg: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8080", }, ReadTimeout: "543", diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 6c54bbabb897a..de41cde9f7c0a 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,11 +44,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 4821b6421eeb4..676eeb66b7405 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 83892d25366d5..97ed93838dbcd 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,8 +42,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index c46d2f24aef75..3f9e311f1d428 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/zipkinreceiver/config.go b/receiver/zipkinreceiver/config.go index ea6c8f6b3aac4..bd54195686338 100644 --- a/receiver/zipkinreceiver/config.go +++ b/receiver/zipkinreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for Zipkin receiver. type Config struct { // Configures the receiver server protocol. - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // If enabled the zipkin receiver will attempt to parse string tags/binary annotations into int/bool/float. // Disabled by default ParseStringTags bool `mapstructure:"parse_string_tags"` diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index c60f358f5cfec..5bd2e350c8ea8 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8765", }, ParseStringTags: false, @@ -42,7 +42,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "parse_strings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: defaultBindEndpoint, }, ParseStringTags: true, diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 8c500bfae9fde..0675a1829e73c 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for Zipkin receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, ParseStringTags: false, diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index a0f4be8791a64..0ac5312ae57dc 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 4667b83f2db1d..41d3b3144d988 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -78,40 +78,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index c5b2c5141e7c7..6ca40f7aed559 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -96,13 +96,13 @@ func (zr *zipkinReceiver) Start(_ context.Context, host component.Host) error { } var err error - zr.server, err = zr.config.HTTPServerConfig.ToServer(host, zr.settings.TelemetrySettings, zr) + zr.server, err = zr.config.ServerConfig.ToServer(host, zr.settings.TelemetrySettings, zr) if err != nil { return err } var listener net.Listener - listener, err = zr.config.HTTPServerConfig.ToListener() + listener, err = zr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index f9a94a9aa741a..e143f55dd2e80 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -63,7 +63,7 @@ func TestNew(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: tt.args.address, }, } @@ -85,7 +85,7 @@ func TestZipkinReceiverPortAlreadyInUse(t *testing.T) { _, portStr, err := net.SplitHostPort(l.Addr().String()) require.NoError(t, err, "failed to split listener address: %v", err) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:" + portStr, }, } @@ -133,7 +133,7 @@ func TestStartTraceReception(t *testing.T) { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, } @@ -226,7 +226,7 @@ func TestReceiverContentTypes(t *testing.T) { next := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, } @@ -253,7 +253,7 @@ func TestReceiverInvalidContentType(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, } @@ -275,7 +275,7 @@ func TestReceiverConsumerError(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9411", }, } @@ -297,7 +297,7 @@ func TestReceiverConsumerPermanentError(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9411", }, } @@ -423,7 +423,7 @@ func TestReceiverConvertsStringsToTypes(t *testing.T) { next := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, ParseStringTags: true, @@ -464,7 +464,7 @@ func TestFromBytesWithNoTimestamp(t *testing.T) { require.NoError(t, err, "Failed to read sample JSON file: %v", err) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, ParseStringTags: true, diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index b5a73a95d059d..76221f598b848 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -78,9 +78,9 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index e8bb763c9ae47..c1a3787f02281 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -138,24 +138,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/testbed/datareceivers/jaeger.go b/testbed/datareceivers/jaeger.go index 3cdaf704bbec1..8d9adf9a1b43f 100644 --- a/testbed/datareceivers/jaeger.go +++ b/testbed/datareceivers/jaeger.go @@ -33,7 +33,7 @@ func NewJaegerDataReceiver(port int) testbed.DataReceiver { func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { factory := jaegerreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*jaegerreceiver.Config) - cfg.Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: "tcp"}, } var err error diff --git a/testbed/datareceivers/sapm.go b/testbed/datareceivers/sapm.go index 215335da2555a..80e993d9dc916 100644 --- a/testbed/datareceivers/sapm.go +++ b/testbed/datareceivers/sapm.go @@ -33,7 +33,7 @@ func NewSapmDataReceiver(port int, compression string) *SapmDataReceiver { // Start the receiver. func (sr *SapmDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { sapmCfg := sapmreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{AccessTokenPassthrough: true}, diff --git a/testbed/datareceivers/signalfx.go b/testbed/datareceivers/signalfx.go index 27973cf40ff5c..70b8c1a32e177 100644 --- a/testbed/datareceivers/signalfx.go +++ b/testbed/datareceivers/signalfx.go @@ -35,7 +35,7 @@ func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver { // Start the receiver. func (sr *SFxMetricsDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { config := signalfxreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, } diff --git a/testbed/datareceivers/splunk.go b/testbed/datareceivers/splunk.go index d475618d87d0a..46a9b407c6cf5 100644 --- a/testbed/datareceivers/splunk.go +++ b/testbed/datareceivers/splunk.go @@ -35,7 +35,7 @@ func NewSplunkHECDataReceiver(port int) *SplunkHECDataReceiver { // Start the receiver. func (sr *SplunkHECDataReceiver) Start(_ consumer.Traces, _ consumer.Metrics, lc consumer.Logs) error { config := splunkhecreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, } diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index 9e01992752fd2..39f380c5a7047 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -79,7 +79,7 @@ type jaegerConfig struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } var _ component.Config = (*jaegerConfig)(nil) @@ -109,7 +109,7 @@ func (je *jaegerGRPCDataSender) newTracesExporter(set exporter.CreateSettings) ( waitForReady: cfg.WaitForReady, connStateReporterInterval: time.Second, stopCh: make(chan struct{}), - clientSettings: &cfg.GRPCClientSettings, + clientSettings: &cfg.ClientConfig, } return exporterhelper.NewTracesExporter( @@ -135,7 +135,7 @@ type protoGRPCSender struct { stopCh chan struct{} stopped bool stopLock sync.Mutex - clientSettings *configgrpc.GRPCClientSettings + clientSettings *configgrpc.ClientConfig } type stateReporter interface { diff --git a/testbed/go.mod b/testbed/go.mod index 2c851560e185c..657d8ff67421c 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -33,30 +33,30 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 @@ -212,15 +212,15 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 46513f52ce346..78b696b745568 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -615,72 +615,72 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/config.go b/testbed/mockdatasenders/mockdatadogagentexporter/config.go index 0153505f378e1..be64bb1da143f 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/config.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/config.go @@ -12,5 +12,5 @@ import ( type Config struct { component.Config // client to send to the agent - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` } diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/factory.go b/testbed/mockdatasenders/mockdatadogagentexporter/factory.go index 471b2d467971c..38b1e12ab9de8 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/factory.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/factory.go @@ -31,7 +31,7 @@ func NewFactory() exporter.Factory { // CreateDefaultConfig creates the default configuration for DDAPM Exporter func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "localhost:8126"}, + ClientConfig: confighttp.ClientConfig{Endpoint: "localhost:8126"}, } } diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod index fa1b6a7935f7e..c0e66bf6af655 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -40,18 +40,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum index d77df8117b908..89b42d80e7f5b 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum @@ -102,40 +102,40 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go b/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go index 01922ad59ca41..e0eebac452361 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go @@ -23,13 +23,13 @@ import ( type ddExporter struct { endpoint string client *http.Client - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig } func createExporter(c *Config) *ddExporter { dd := &ddExporter{ endpoint: c.Endpoint, - clientSettings: &c.HTTPClientConfig, + clientSettings: &c.ClientConfig, client: nil, }