diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index ce706a37a63..e126d8cbfb1 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -112,7 +112,7 @@ require ( go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect go.opentelemetry.io/collector/service v0.111.0 // indirect - go.opentelemetry.io/contrib/config v0.10.0 // indirect + go.opentelemetry.io/contrib/config v0.11.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum index 9779d4dece0..076ba22c4ca 100644 --- a/cmd/otelcorecol/go.sum +++ b/cmd/otelcorecol/go.sum @@ -109,8 +109,8 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= +go.opentelemetry.io/contrib/config v0.11.0 h1:KWhWSliKdn4rYEZ179Fu3NzCFk2w8TIxiiNXNlcyQ/s= +go.opentelemetry.io/contrib/config v0.11.0/go.mod h1:tU0JcTFVMopvCZ4m9AJvQ5Rsw4XGtE35Lkh5xKDlbRM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 h1:yMkBS9yViCc7U7yeLzJPM2XizlfdVvBRSmsQDWu6qc0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0/go.mod h1:n8MR6/liuGB5EmTETUBeU5ZgqMOlqKRxUaqPQBOANZ8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index eb45225e696..6c4cac308e2 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -91,7 +91,7 @@ require ( go.opentelemetry.io/collector/processor/processortest v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect - go.opentelemetry.io/contrib/config v0.10.0 // indirect + go.opentelemetry.io/contrib/config v0.11.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum index bf723e761bd..fe872949772 100644 --- a/internal/e2e/go.sum +++ b/internal/e2e/go.sum @@ -101,8 +101,8 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= +go.opentelemetry.io/contrib/config v0.11.0 h1:KWhWSliKdn4rYEZ179Fu3NzCFk2w8TIxiiNXNlcyQ/s= +go.opentelemetry.io/contrib/config v0.11.0/go.mod h1:tU0JcTFVMopvCZ4m9AJvQ5Rsw4XGtE35Lkh5xKDlbRM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 h1:yMkBS9yViCc7U7yeLzJPM2XizlfdVvBRSmsQDWu6qc0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0/go.mod h1:n8MR6/liuGB5EmTETUBeU5ZgqMOlqKRxUaqPQBOANZ8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= diff --git a/otelcol/config_test.go b/otelcol/config_test.go index e0455330bda..ff6c02c3b64 100644 --- a/otelcol/config_test.go +++ b/otelcol/config_test.go @@ -279,7 +279,7 @@ func generateConfig() *Config { Level: configtelemetry.LevelNormal, Readers: []config.MetricReader{ { - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{ Prometheus: &config.Prometheus{ Host: newPtr("localhost"), Port: newPtr(8080), diff --git a/otelcol/go.mod b/otelcol/go.mod index 49f30570f4d..6b0e1fd06d4 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -18,7 +18,7 @@ require ( go.opentelemetry.io/collector/processor/processortest v0.111.0 go.opentelemetry.io/collector/receiver v0.111.0 go.opentelemetry.io/collector/service v0.111.0 - go.opentelemetry.io/contrib/config v0.10.0 + go.opentelemetry.io/contrib/config v0.11.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 diff --git a/otelcol/go.sum b/otelcol/go.sum index e6581163b83..1b3bfb52ea1 100644 --- a/otelcol/go.sum +++ b/otelcol/go.sum @@ -107,8 +107,8 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= +go.opentelemetry.io/contrib/config v0.11.0 h1:KWhWSliKdn4rYEZ179Fu3NzCFk2w8TIxiiNXNlcyQ/s= +go.opentelemetry.io/contrib/config v0.11.0/go.mod h1:tU0JcTFVMopvCZ4m9AJvQ5Rsw4XGtE35Lkh5xKDlbRM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= go.opentelemetry.io/contrib/propagators/b3 v1.31.0 h1:PQPXYscmwbCp76QDvO4hMngF2j8Bx/OTV86laEl8uqo= diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index cecd594cc43..8483a00736b 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -77,7 +77,7 @@ require ( go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect go.opentelemetry.io/collector/semconv v0.111.0 // indirect - go.opentelemetry.io/contrib/config v0.10.0 // indirect + go.opentelemetry.io/contrib/config v0.11.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum index e6581163b83..1b3bfb52ea1 100644 --- a/otelcol/otelcoltest/go.sum +++ b/otelcol/otelcoltest/go.sum @@ -107,8 +107,8 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= +go.opentelemetry.io/contrib/config v0.11.0 h1:KWhWSliKdn4rYEZ179Fu3NzCFk2w8TIxiiNXNlcyQ/s= +go.opentelemetry.io/contrib/config v0.11.0/go.mod h1:tU0JcTFVMopvCZ4m9AJvQ5Rsw4XGtE35Lkh5xKDlbRM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= go.opentelemetry.io/contrib/propagators/b3 v1.31.0 h1:PQPXYscmwbCp76QDvO4hMngF2j8Bx/OTV86laEl8uqo= diff --git a/service/config_test.go b/service/config_test.go index 09567436cfa..37466c129f4 100644 --- a/service/config_test.go +++ b/service/config_test.go @@ -99,7 +99,7 @@ func generateConfig() *Config { Metrics: telemetry.MetricsConfig{ Level: configtelemetry.LevelNormal, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: newPtr("localhost"), Port: newPtr(8080), }}}}, diff --git a/service/go.mod b/service/go.mod index 11c4fa9cd5d..794b7ea515b 100644 --- a/service/go.mod +++ b/service/go.mod @@ -37,7 +37,7 @@ require ( go.opentelemetry.io/collector/receiver v0.111.0 go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 go.opentelemetry.io/collector/semconv v0.111.0 - go.opentelemetry.io/contrib/config v0.10.0 + go.opentelemetry.io/contrib/config v0.11.0 go.opentelemetry.io/contrib/propagators/b3 v1.31.0 go.opentelemetry.io/otel v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 diff --git a/service/go.sum b/service/go.sum index d1ebfb66b56..6b9a184c95c 100644 --- a/service/go.sum +++ b/service/go.sum @@ -99,8 +99,8 @@ 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.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= -go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= +go.opentelemetry.io/contrib/config v0.11.0 h1:KWhWSliKdn4rYEZ179Fu3NzCFk2w8TIxiiNXNlcyQ/s= +go.opentelemetry.io/contrib/config v0.11.0/go.mod h1:tU0JcTFVMopvCZ4m9AJvQ5Rsw4XGtE35Lkh5xKDlbRM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= go.opentelemetry.io/contrib/propagators/b3 v1.31.0 h1:PQPXYscmwbCp76QDvO4hMngF2j8Bx/OTV86laEl8uqo= diff --git a/service/service_test.go b/service/service_test.go index d1663a8212e..aa7acfb496c 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -312,7 +312,7 @@ func testCollectorStartHelperWithReaders(t *testing.T, tc ownMetricsTestCase, ne cfg.Telemetry.Metrics.Readers = []config.MetricReader{ { Pull: &config.PullMetricReader{ - Exporter: config.MetricExporter{ + Exporter: config.PullMetricExporter{ Prometheus: metricsAddr, }, }, @@ -644,7 +644,7 @@ func newNopConfigPipelineConfigs(pipelineCfgs pipelines.Config) Config { Metrics: telemetry.MetricsConfig{ Level: configtelemetry.LevelBasic, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: newPtr("localhost"), Port: newPtr(8888), }}}}, diff --git a/service/telemetry/config.go b/service/telemetry/config.go index 6cdb12bf6db..5bffc1a75eb 100644 --- a/service/telemetry/config.go +++ b/service/telemetry/config.go @@ -184,7 +184,7 @@ func (c *Config) Unmarshal(conf *confmap.Conf) error { c.Metrics.Readers = append(c.Metrics.Readers, config.MetricReader{ Pull: &config.PullMetricReader{ - Exporter: config.MetricExporter{ + Exporter: config.PullMetricExporter{ Prometheus: &config.Prometheus{ Host: &host, Port: &portInt, diff --git a/service/telemetry/config_test.go b/service/telemetry/config_test.go index 9f8f9da1efd..e012ac0efa2 100644 --- a/service/telemetry/config_test.go +++ b/service/telemetry/config_test.go @@ -118,7 +118,7 @@ func TestConfigValidate(t *testing.T) { Metrics: MetricsConfig{ Level: configtelemetry.LevelBasic, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: newPtr("127.0.0.1"), Port: newPtr(3333), }}}}, diff --git a/service/telemetry/factory.go b/service/telemetry/factory.go index 9f25402adbe..b3d3d74610a 100644 --- a/service/telemetry/factory.go +++ b/service/telemetry/factory.go @@ -114,7 +114,7 @@ func createDefaultConfig() component.Config { Metrics: MetricsConfig{ Level: configtelemetry.LevelNormal, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: &metricsHost, Port: newPtr(8888), }}}}, diff --git a/service/telemetry/factory_test.go b/service/telemetry/factory_test.go index 86ba38cd460..41c068694bb 100644 --- a/service/telemetry/factory_test.go +++ b/service/telemetry/factory_test.go @@ -66,7 +66,7 @@ func TestTelemetryConfiguration(t *testing.T) { Metrics: MetricsConfig{ Level: configtelemetry.LevelBasic, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: newPtr("127.0.0.1"), Port: newPtr(3333), }}}}, @@ -84,7 +84,7 @@ func TestTelemetryConfiguration(t *testing.T) { Metrics: MetricsConfig{ Level: configtelemetry.LevelBasic, Readers: []config.MetricReader{{ - Pull: &config.PullMetricReader{Exporter: config.MetricExporter{Prometheus: &config.Prometheus{ + Pull: &config.PullMetricReader{Exporter: config.PullMetricExporter{Prometheus: &config.Prometheus{ Host: newPtr("127.0.0.1"), Port: newPtr(3333), }}}},